diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt
index 7a74bb9cd11..233bed9b9d3 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt
@@ -142,7 +142,7 @@ interface FirDeclarationPresenter {
         appendRepresentation(it.returnTypeRef)
     }
 
-    fun represent(it: FirProperty) = buildString {
+    fun represent(it: FirVariable) = buildString {
         append('[')
         it.receiverTypeRef?.let {
             appendRepresentation(it)
@@ -241,7 +241,7 @@ open class FirDeclarationInspector(
             declaration is FirSimpleFunction -> collectFunction(presenter.represent(declaration), declaration)
             declaration is FirRegularClass -> collectNonFunctionDeclaration(presenter.represent(declaration), declaration)
             declaration is FirTypeAlias -> collectNonFunctionDeclaration(presenter.represent(declaration), declaration)
-            declaration is FirProperty -> collectNonFunctionDeclaration(presenter.represent(declaration), declaration)
+            declaration is FirVariable -> collectNonFunctionDeclaration(presenter.represent(declaration), declaration)
         }
     }
 
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.fir.kt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.fir.kt
deleted file mode 100644
index 8089c93e100..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.fir.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-//KT-2418 Front-end allows enum constants with same name
-
-package kt2418
-
-enum class A {
-    FOO,
-    FOO
-}
-
-enum class B {
-    FOO;
-    
-    fun FOO() {}
-}
-
-enum class C {
-    FOO;
-    
-    val FOO = 1
-}
-
-enum class D {
-    FOO;
-    
-    class FOO {}
-}
-
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt
index 0363a94b7bf..037d7d2fbf3 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 //KT-2418 Front-end allows enum constants with same name
 
 package kt2418