diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7c35f06c3bcc096cf17f2f89ca699e3e4c0e2b27..2a14a42a6c0ceabb9b1626c28836e1dc8c42ab36 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -7,7 +7,7 @@ import { CreateCommentComponent } from './components/pages/comment-create/commen
 import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
 import { AuthenticationGuard } from './guards/authentication.guard';
 import { UserRole } from './models/user-roles.enum';
-import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
+import { ParticipantRoomComponent } from './components/pages/room-participant/room-participant.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';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3e6df8446bbdd7f65be19101e1a728f73629add3..8360ff70936b546311debcc71f40f7d2f1d0c197 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -60,7 +60,7 @@ import { CreatorHomeScreenComponent } from './components/pages/creator-home-scre
 import { CreateCommentComponent } from './components/pages/comment-create/comment-create.component';
 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 { ParticipantRoomComponent } from './components/pages/room-participant/room-participant.component';
 import { DataStoreService } from './services/util/data-store.service';
 import { CreatorRoomComponent } from './components/pages/room-creator/room-creator.component';
 import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
diff --git a/src/app/components/pages/participant-room/participant-room.component.html b/src/app/components/pages/room-participant/room-participant.component.html
similarity index 100%
rename from src/app/components/pages/participant-room/participant-room.component.html
rename to src/app/components/pages/room-participant/room-participant.component.html
diff --git a/src/app/components/pages/participant-room/participant-room.component.scss b/src/app/components/pages/room-participant/room-participant.component.scss
similarity index 100%
rename from src/app/components/pages/participant-room/participant-room.component.scss
rename to src/app/components/pages/room-participant/room-participant.component.scss
diff --git a/src/app/components/pages/participant-room/participant-room.component.spec.ts b/src/app/components/pages/room-participant/room-participant.component.spec.ts
similarity index 90%
rename from src/app/components/pages/participant-room/participant-room.component.spec.ts
rename to src/app/components/pages/room-participant/room-participant.component.spec.ts
index 37811a7fbe4e4e2f3b30d9b43e7d698880c5850f..7e552aa17e1f5792f7c532659acd496f749ef9ae 100644
--- a/src/app/components/pages/participant-room/participant-room.component.spec.ts
+++ b/src/app/components/pages/room-participant/room-participant.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ParticipantRoomComponent } from './participant-room.component';
+import { ParticipantRoomComponent } from './room-participant.component';
 
 describe('ParticipantRoomComponent', () => {
   let component: ParticipantRoomComponent;
diff --git a/src/app/components/pages/participant-room/participant-room.component.ts b/src/app/components/pages/room-participant/room-participant.component.ts
similarity index 89%
rename from src/app/components/pages/participant-room/participant-room.component.ts
rename to src/app/components/pages/room-participant/room-participant.component.ts
index f095234ca0a0f121c4056e06df1011dbeeaed3a6..ea18ff62857cebde2745ec6c584931e7544e4b54 100644
--- a/src/app/components/pages/participant-room/participant-room.component.ts
+++ b/src/app/components/pages/room-participant/room-participant.component.ts
@@ -6,8 +6,8 @@ import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-participant-room',
-  templateUrl: './participant-room.component.html',
-  styleUrls: ['./participant-room.component.scss']
+  templateUrl: './room-participant.component.html',
+  styleUrls: ['./room-participant.component.scss']
 })
 export class ParticipantRoomComponent implements OnInit {