diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 66888b24f38b2f89bfe3e592773cf8ffd0b5fe3c..7c35f06c3bcc096cf17f2f89ca699e3e4c0e2b27 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -8,7 +8,7 @@ import { ParticipantHomeScreenComponent } from './components/pages/participant-h
 import { AuthenticationGuard } from './guards/authentication.guard';
 import { UserRole } from './models/user-roles.enum';
 import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
-import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
+import { CreatorRoomComponent } from './components/pages/room-creator/room-creator.component';
 import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
 import { ContentListComponent } from './components/fragments/content-list/content-list.component';
 import { AnswerStatisticsComponent } from './components/fragments/statistics/statistics.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f7e45e691667281b7a7db14c59ce371d16f42442..3e6df8446bbdd7f65be19101e1a728f73629add3 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -62,7 +62,7 @@ import { CommentService } from './services/http/comment.service';
 import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
 import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
 import { DataStoreService } from './services/util/data-store.service';
-import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
+import { CreatorRoomComponent } from './components/pages/room-creator/room-creator.component';
 import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
 import { ContentListComponent } from './components/fragments/content-list/content-list.component';
 import { ContentService } from './services/http/content.service';
diff --git a/src/app/components/pages/creator-room/creator-room.component.html b/src/app/components/pages/room-creator/room-creator.component.html
similarity index 100%
rename from src/app/components/pages/creator-room/creator-room.component.html
rename to src/app/components/pages/room-creator/room-creator.component.html
diff --git a/src/app/components/pages/creator-room/creator-room.component.scss b/src/app/components/pages/room-creator/room-creator.component.scss
similarity index 100%
rename from src/app/components/pages/creator-room/creator-room.component.scss
rename to src/app/components/pages/room-creator/room-creator.component.scss
diff --git a/src/app/components/pages/creator-room/creator-room.component.spec.ts b/src/app/components/pages/room-creator/room-creator.component.spec.ts
similarity index 90%
rename from src/app/components/pages/creator-room/creator-room.component.spec.ts
rename to src/app/components/pages/room-creator/room-creator.component.spec.ts
index d6900873e6ee052be6865a8449ac08158c2d22ff..ac71fbfed5f2146cebd3408c44e1b29dba6b85cd 100644
--- a/src/app/components/pages/creator-room/creator-room.component.spec.ts
+++ b/src/app/components/pages/room-creator/room-creator.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CreatorRoomComponent } from './creator-room.component';
+import { CreatorRoomComponent } from './room-creator.component';
 
 describe('CreatorRoomComponent', () => {
   let component: CreatorRoomComponent;
diff --git a/src/app/components/pages/creator-room/creator-room.component.ts b/src/app/components/pages/room-creator/room-creator.component.ts
similarity index 96%
rename from src/app/components/pages/creator-room/creator-room.component.ts
rename to src/app/components/pages/room-creator/room-creator.component.ts
index f9d8aa34d214acb5f88a8d9a1f855f363a68b574..e6ef5ae32c6f72326a8fb1c7d090782f025503ff 100644
--- a/src/app/components/pages/creator-room/creator-room.component.ts
+++ b/src/app/components/pages/room-creator/room-creator.component.ts
@@ -11,8 +11,8 @@ import { RoomModificationComponent } from '../../dialogs/room-edit/room-edit.com
 
 @Component({
   selector: 'app-creator-room',
-  templateUrl: './creator-room.component.html',
-  styleUrls: ['./creator-room.component.scss']
+  templateUrl: './room-creator.component.html',
+  styleUrls: ['./room-creator.component.scss']
 })
 export class CreatorRoomComponent extends RoomComponent implements OnInit {
   room: Room;