diff --git a/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc
index c69bad6bdf6..ceb6d92b41b 100644
--- a/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc
+++ b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc
@@ -6,16 +6,16 @@ class NonFinalClassFinalMembers
 {
     final public const BAR = 1;
 
-    final public static string $privateProperty = 'test';
+    final public static string $publicProperty = 'test';
 
-    final public static function privateMethod(): void
+    final public static function publicMethod(): void
     {
     }
 
     public function run()
     {
-        static::$privateProperty;
-        static::privateMethod();
+        static::$publicProperty;
+        static::publicMethod();
         static::BAR;
     }
 }
@@ -30,16 +30,16 @@ class NonFinalClassFinalMembers
 {
     final public const BAR = 1;
 
-    final public static string $privateProperty = 'test';
+    final public static string $publicProperty = 'test';
 
-    final public static function privateMethod(): void
+    final public static function publicMethod(): void
     {
     }
 
     public function run()
     {
-        self::$privateProperty;
-        self::privateMethod();
+        self::$publicProperty;
+        self::publicMethod();
         self::BAR;
     }
 }
diff --git a/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/skip_final_doc_property.php.inc b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/skip_final_doc_property.php.inc
new file mode 100644
index 00000000000..a6c3e67afac
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/skip_final_doc_property.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+class SkipFinalDocProperty
+{
+    /**
+     * @final
+     */
+    public static string $publicProperty = 'test';
+
+    public function run()
+    {
+        static::$publicProperty;
+    }
+}
+
+?>
diff --git a/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php b/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
index 01af812c262..7d256c9b881 100644
--- a/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
+++ b/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
@@ -165,7 +165,7 @@ private function shouldSkip(
         if (! $isFinal) {
             $memberIsFinal = $reflection instanceof ClassConstantReflection
                 ? $reflection->isFinal()
-                : $reflection->isFinal()->yes();
+                : $reflection->isFinalByKeyword()->yes();
 
             // Final native members can be safely converted
             if ($memberIsFinal) {