diff --git a/smash/web/templates/flying_teams/add.html b/smash/web/templates/flying_teams/add.html
index 8b348d775c6deb10c182cb3bba9b47a106fb8c03..6f73282237def5e71285b7b9059fd495398af864 100644
--- a/smash/web/templates/flying_teams/add.html
+++ b/smash/web/templates/flying_teams/add.html
@@ -21,7 +21,7 @@
 
         <div class="box box-info">
             <div class="box-header with-border">
-                <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Go back (without changes)</a>
+                <a href="{% url 'web.views.equipment_and_rooms.flying_teams' %}" class="btn btn-block btn-default">Go back (without changes)</a>
             </div>
 
             <form method="post" action="" class="form-horizontal">
diff --git a/smash/web/templates/equipment_and_rooms/flying_teams.html b/smash/web/templates/flying_teams/index.html
similarity index 100%
rename from smash/web/templates/equipment_and_rooms/flying_teams.html
rename to smash/web/templates/flying_teams/index.html
diff --git a/smash/web/tests/view/test_flying_teams.py b/smash/web/tests/view/test_flying_teams.py
index 52a27ac3258e22f36d0942f5f3a8eacb7ce0ecf5..384bfa5662d073885827594e46cde326512331b1 100644
--- a/smash/web/tests/view/test_flying_teams.py
+++ b/smash/web/tests/view/test_flying_teams.py
@@ -8,7 +8,7 @@ class FlyingTeamTests(LoggedInTestCase):
     def test_flyingteam_requests(self):
         pages = [
             'web.views.equipment_and_rooms.flying_teams',
-            'web.views.equipment_and_rooms.flying_teams.add',
+            'web.views.equipment_and_rooms.flying_teams_add',
         ]
 
         for page in pages:
diff --git a/smash/web/views/equipment.py b/smash/web/views/equipment.py
index d145840c7098d7baa93d23aa4d84e839be2ef6c5..17bed34e4a012f363774f8ddeb840fd68d1e8578 100644
--- a/smash/web/views/equipment.py
+++ b/smash/web/views/equipment.py
@@ -26,7 +26,7 @@ def flying_teams(request):
     }
 
     return wrap_response(request,
-                         "equipment_and_rooms/flying_teams.html",
+                         "flying_teams/index.html",
                          context)