diff --git a/idea/testData/debugger/tinyApp/outs/fieldWatchpoints.out b/idea/testData/debugger/tinyApp/outs/fieldWatchpoints.out
deleted file mode 100644
index a1c1179a1e0..00000000000
--- a/idea/testData/debugger/tinyApp/outs/fieldWatchpoints.out
+++ /dev/null
@@ -1,44 +0,0 @@
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:4
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:7
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:17
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:20
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:30
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:32
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:44
-KotlinFieldBreakpoint created at fieldWatchpoints.kt:47
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fieldWatchpoints.FieldWatchpointsPackage
-Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-fieldWatchpoints.kt:18
-fieldWatchpoints.kt:21
-fieldWatchpoints.kt:59
-fieldWatchpoints.kt:5
-fieldWatchpoints.kt:8
-fieldWatchpoints.kt:59
-fieldWatchpoints.kt:11
-fieldWatchpoints.kt:12
-fieldWatchpoints.kt:13
-fieldWatchpoints.kt:60
-fieldWatchpoints.kt:24
-fieldWatchpoints.kt:25
-fieldWatchpoints.kt:26
-fieldWatchpoints.kt:61
-fieldWatchpoints.kt:0
-fieldWatchpoints.kt:0
-fieldWatchpoints.kt:61
-fieldWatchpoints.kt:36
-fieldWatchpoints.kt:37
-fieldWatchpoints.kt:38
-fieldWatchpoints.kt:62
-fieldWatchpoints.kt:45
-fieldWatchpoints.kt:48
-fieldWatchpoints.kt:62
-fieldWatchpoints.kt:45
-fieldWatchpoints.kt:51
-fieldWatchpoints.kt:48
-fieldWatchpoints.kt:52
-fieldWatchpoints.kt:48
-fieldWatchpoints.kt:54
-fieldWatchpoints.kt:63
-Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-
-Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/fwBackingField.out b/idea/testData/debugger/tinyApp/outs/fwBackingField.out
new file mode 100644
index 00000000000..2838bee2400
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/fwBackingField.out
@@ -0,0 +1,44 @@
+KotlinFieldBreakpoint created at fwBackingField.kt:4
+KotlinFieldBreakpoint created at fwBackingField.kt:7
+KotlinFieldBreakpoint created at fwBackingField.kt:17
+KotlinFieldBreakpoint created at fwBackingField.kt:20
+KotlinFieldBreakpoint created at fwBackingField.kt:30
+KotlinFieldBreakpoint created at fwBackingField.kt:32
+KotlinFieldBreakpoint created at fwBackingField.kt:44
+KotlinFieldBreakpoint created at fwBackingField.kt:47
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! fwBackingField.FwBackingFieldPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+fwBackingField.kt:18
+fwBackingField.kt:21
+fwBackingField.kt:59
+fwBackingField.kt:5
+fwBackingField.kt:8
+fwBackingField.kt:59
+fwBackingField.kt:11
+fwBackingField.kt:12
+fwBackingField.kt:13
+fwBackingField.kt:60
+fwBackingField.kt:24
+fwBackingField.kt:25
+fwBackingField.kt:26
+fwBackingField.kt:61
+fwBackingField.kt:0
+fwBackingField.kt:0
+fwBackingField.kt:61
+fwBackingField.kt:36
+fwBackingField.kt:37
+fwBackingField.kt:38
+fwBackingField.kt:62
+fwBackingField.kt:45
+fwBackingField.kt:48
+fwBackingField.kt:62
+fwBackingField.kt:45
+fwBackingField.kt:51
+fwBackingField.kt:48
+fwBackingField.kt:52
+fwBackingField.kt:48
+fwBackingField.kt:54
+fwBackingField.kt:63
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt
similarity index 97%
rename from idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt
rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt
index c1b709a5eff..77942a56b6a 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt
@@ -1,4 +1,4 @@
-package fieldWatchpoints
+package fwBackingField
 
 class A {
     //FieldWatchpoint! (propVal)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
index 7935eb31a24..8cbd776fddb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java
@@ -286,9 +286,9 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOut"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("fieldWatchpoints.kt")
-        public void testFieldWatchpoints() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt");
+        @TestMetadata("fwBackingField.kt")
+        public void testFwBackingField() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt");
             doStepOutTest(fileName);
         }