diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4744918af5978f0d7273281dbaa622821ea17652..b88ff247f6ac410a1e1c85c9f4fab2ff1e3f2272 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -34,31 +34,31 @@ const routes: Routes = [
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room-page/:roomId',
+    path: 'creator/room/:roomId',
     component: RoomCreatorPageComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room-page/:roomId/content-create-page',
+    path: 'creator/room/:roomId/create-content',
     component: ContentCreatePageComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room-page/:roomId/statistics',
+    path: 'creator/room/:roomId/statistics',
     component: StatisticsComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room-page/:roomId/comments',
+    path: 'creator/room/:roomId/comments',
     component: CommentListComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room-page/:roomId/content',
+    path: 'creator/room/:roomId/content',
     component: ContentListComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }
@@ -70,19 +70,19 @@ const routes: Routes = [
     data: { roles: [UserRole.PARTICIPANT] }
   },
   {
-    path: 'participant/room-page/:roomId',
+    path: 'participant/room/:roomId',
     component: RoomParticipantPageComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.PARTICIPANT] }
   },
   {
-    path: 'participant/room-page/:roomId/comment-create-page',
+    path: 'participant/room/:roomId/create-comment',
     component: CommentCreatePageComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.PARTICIPANT] }
   },
   {
-    path: 'participant/room-page/:roomId/questions',
+    path: 'participant/room/:roomId/questions',
     component: ContentCarouselPageComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.PARTICIPANT] }
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.html b/src/app/components/pages/room-creator-page/room-creator-page.component.html
index 799c44aa86a34b59b40aeb514ad7d2500afc8548..d691d5959ba28acdeb087c3aa7b44878a5045cce 100644
--- a/src/app/components/pages/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/pages/room-creator-page/room-creator-page.component.html
@@ -23,7 +23,7 @@
       <mat-divider></mat-divider>
       <mat-card-actions>
         <button mat-button color="primary" matTooltip="Create new content"
-                routerLink="/creator/room/{{room.id}}/add-content">
+                routerLink="/creator/room/{{room.id}}/create-content">
           Create content
         </button>
         <button mat-button color="primary" matTooltip="See room comments" routerLink="/creator/room/{{room.id}}/comments">