diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/class.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/class.kt
index ffa1a2204b4..f60ca4f611a 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/class.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/class.kt
@@ -1,6 +1,6 @@
-class A {/* NonLocalDeclarationFileStructureElement */
-    fun x() {/* IncrementallyReanalyzableFunction */
+class A {/* NonReanalyzableDeclarationStructureElement */
+    fun x() {/* ReanalyzableFunctionStructureElement */
 
     }
-    fun y(): Int = 10/* IncrementallyReanalyzableFunction */
+    fun y(): Int = 10/* ReanalyzableFunctionStructureElement */
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localClass.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localClass.kt
index 2a943ad2047..ce41e29aa54 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localClass.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localClass.kt
@@ -1,9 +1,9 @@
-fun a() {/* IncrementallyReanalyzableFunction */
+fun a() {/* ReanalyzableFunctionStructureElement */
     class X
 }
 
-class Y {/* NonLocalDeclarationFileStructureElement */
-    fun b() {/* IncrementallyReanalyzableFunction */
+class Y {/* NonReanalyzableDeclarationStructureElement */
+    fun b() {/* ReanalyzableFunctionStructureElement */
         class Z
     }
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localFun.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localFun.kt
index 4331ea276c4..e10eeca4ee1 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localFun.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/localFun.kt
@@ -1,11 +1,11 @@
-fun x() {/* IncrementallyReanalyzableFunction */
+fun x() {/* ReanalyzableFunctionStructureElement */
     fun y() {
 
     }
 }
 
-class A {/* NonLocalDeclarationFileStructureElement */
-    fun z() {/* IncrementallyReanalyzableFunction */
+class A {/* NonReanalyzableDeclarationStructureElement */
+    fun z() {/* ReanalyzableFunctionStructureElement */
         fun q() {
 
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/nestedClasses.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/nestedClasses.kt
index f4d1fc3f430..d21bcc065d8 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/nestedClasses.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/nestedClasses.kt
@@ -1,16 +1,16 @@
-class A {/* NonLocalDeclarationFileStructureElement */
-    class B {/* NonLocalDeclarationFileStructureElement */
-        fun x() {/* IncrementallyReanalyzableFunction */
+class A {/* NonReanalyzableDeclarationStructureElement */
+    class B {/* NonReanalyzableDeclarationStructureElement */
+        fun x() {/* ReanalyzableFunctionStructureElement */
         }
 
-        class C {/* NonLocalDeclarationFileStructureElement */
+        class C {/* NonReanalyzableDeclarationStructureElement */
 
         }
     }
 
-    class E {/* NonLocalDeclarationFileStructureElement */
+    class E {/* NonReanalyzableDeclarationStructureElement */
 
     }
 
-    fun y(): Int = 10/* IncrementallyReanalyzableFunction */
+    fun y(): Int = 10/* ReanalyzableFunctionStructureElement */
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithType.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithType.kt
index 672f5070290..4733b336619 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithType.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithType.kt
@@ -1 +1 @@
-fun foo(): Int = 42/* IncrementallyReanalyzableFunction */
\ No newline at end of file
+fun foo(): Int = 42/* ReanalyzableFunctionStructureElement */
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithoutType.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithoutType.kt
index f9f7b502c6b..089bd79a4e9 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithoutType.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelExpressionBodyFunWithoutType.kt
@@ -1 +1 @@
-fun foo() = 42/* NonLocalDeclarationFileStructureElement */
\ No newline at end of file
+fun foo() = 42/* NonReanalyzableDeclarationStructureElement */
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelFunWithType.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelFunWithType.kt
index d1eab252b95..850cad4630f 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelFunWithType.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelFunWithType.kt
@@ -1,4 +1,4 @@
-fun foo(): Int {/* IncrementallyReanalyzableFunction */
+fun foo(): Int {/* ReanalyzableFunctionStructureElement */
     println("")
     return 10
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelUnitFun.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelUnitFun.kt
index 774c4cd6abd..39edd9f8db0 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelUnitFun.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/fileStructure/topLevelUnitFun.kt
@@ -1,4 +1,4 @@
-fun foo() {/* IncrementallyReanalyzableFunction */
+fun foo() {/* ReanalyzableFunctionStructureElement */
     println("")
 }