diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
index dbfba47..c2dfeba 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
@@ -12,7 +12,7 @@ import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/team_match/organize_teams_view.dart';
+import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:tallee/presentation/widgets/player_selection.dart';
@@ -300,7 +300,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
           context,
           adaptivePageRoute(
             fullscreenDialog: !isTeamMatch,
-            builder: (context) => OrganizeTeamsView(match: match),
+            builder: (context) => CreateTeamsView(match: match),
           ),
         );
       }
diff --git a/lib/presentation/views/main_menu/match_view/create_match/team_match/organize_teams_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
similarity index 96%
rename from lib/presentation/views/main_menu/match_view/create_match/team_match/organize_teams_view.dart
rename to lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
index 47f794c..e410834 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/team_match/organize_teams_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart
@@ -10,21 +10,21 @@ import 'package:tallee/data/models/match.dart';
 import 'package:tallee/data/models/player.dart';
 import 'package:tallee/data/models/team.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/team_match/edit_members_view.dart';
+import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/team_creation_tile.dart';
 
-class OrganizeTeamsView extends StatefulWidget {
-  const OrganizeTeamsView({super.key, required this.match});
+class CreateTeamsView extends StatefulWidget {
+  const CreateTeamsView({super.key, required this.match});
 
   final Match match;
 
   @override
-  State<OrganizeTeamsView> createState() => _OrganizeTeamsViewState();
+  State<CreateTeamsView> createState() => _CreateTeamsViewState();
 }
 
-class _OrganizeTeamsViewState extends State<OrganizeTeamsView> {
+class _CreateTeamsViewState extends State<CreateTeamsView> {
   final Random random = Random();
   late List<Team> teams;
   late List<TextEditingController> nameController;
diff --git a/lib/presentation/views/main_menu/match_view/create_match/team_match/edit_members_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart
similarity index 100%
rename from lib/presentation/views/main_menu/match_view/create_match/team_match/edit_members_view.dart
rename to lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart