diff --git a/lib/form_test.dart b/lib/form_screen.dart
similarity index 90%
rename from lib/form_test.dart
rename to lib/form_screen.dart
index 61eb55e..d703b9d 100644
--- a/lib/form_test.dart
+++ b/lib/form_screen.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 
-class FormTestPage extends StatefulWidget {
-  const FormTestPage({super.key});
+class FormScreen extends StatefulWidget {
+  const FormScreen({super.key});
 
   @override
-  State<FormTestPage> createState() => _FormTestPageState();
+  State<FormScreen> createState() => _FormScreenState();
 }
 
-class _FormTestPageState extends State<FormTestPage> {
+class _FormScreenState extends State<FormScreen> {
   final TextEditingController _emailController = TextEditingController();
   final TextEditingController _passwordController = TextEditingController();
 
diff --git a/lib/main.dart b/lib/main.dart
index 6d027a5..e639ad5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,8 +1,8 @@
-import 'package:demo_app/form_test.dart';
+import 'package:demo_app/form_screen.dart';
 import 'package:demo_app/issue_1619_repro.dart';
 import 'package:demo_app/issue_1677_repro.dart';
 import 'package:demo_app/nesting_screen.dart';
-import 'package:demo_app/swipe_test.dart';
+import 'package:demo_app/swiping_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -85,7 +85,7 @@ class _MyHomePageState extends State<MyHomePage> {
             ElevatedButton(
               onPressed: () {
                 Navigator.of(context).push(
-                  MaterialPageRoute(builder: (_) => const SwipeTestPage()),
+                  MaterialPageRoute(builder: (_) => const SwipingScreen()),
                 );
               },
               child: const Text('Swipe Test'),
@@ -93,7 +93,7 @@ class _MyHomePageState extends State<MyHomePage> {
             ElevatedButton(
               onPressed: () {
                 Navigator.of(context).push(
-                  MaterialPageRoute(builder: (_) => const FormTestPage()),
+                  MaterialPageRoute(builder: (_) => const FormScreen()),
                 );
               },
               child: const Text('Form Test'),
diff --git a/lib/swipe_test.dart b/lib/swiping_screen.dart
similarity index 93%
rename from lib/swipe_test.dart
rename to lib/swiping_screen.dart
index 09469cb..64db839 100644
--- a/lib/swipe_test.dart
+++ b/lib/swiping_screen.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 
-class SwipeTestPage extends StatefulWidget {
-  const SwipeTestPage({super.key});
+class SwipingScreen extends StatefulWidget {
+  const SwipingScreen({super.key});
 
   @override
-  State<SwipeTestPage> createState() => _SwipeTestPageState();
+  State<SwipingScreen> createState() => _SwipingScreenState();
 }
 
-class _SwipeTestPageState extends State<SwipeTestPage> {
+class _SwipingScreenState extends State<SwipingScreen> {
   List<Color> containerColors = [Colors.red, Colors.red, Colors.red];
   bool finished = false;