diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8a327b42e8a9ce5595346c3532030e13fbf7a813..29ec714cc019cae38d19965f2d0f4bf187642d46 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { JoinRoomComponent } from './components/fragments/join-room/join-room.component';
+import { JoinRoomComponent } from './components/fragments/room-join/room-join.component';
 import { LoginComponent } from './components/fragments/login/login.component';
 import { RegisterComponent } from './components/dialogs/register/register.component';
 import { PasswordResetComponent } from './components/dialogs/password-reset/password-reset.component';
diff --git a/src/app/components/fragments/join-room/join-room.component.html b/src/app/components/fragments/room-join/room-join.component.html
similarity index 100%
rename from src/app/components/fragments/join-room/join-room.component.html
rename to src/app/components/fragments/room-join/room-join.component.html
diff --git a/src/app/components/fragments/join-room/join-room.component.scss b/src/app/components/fragments/room-join/room-join.component.scss
similarity index 100%
rename from src/app/components/fragments/join-room/join-room.component.scss
rename to src/app/components/fragments/room-join/room-join.component.scss
diff --git a/src/app/components/fragments/join-room/join-room.component.spec.ts b/src/app/components/fragments/room-join/room-join.component.spec.ts
similarity index 90%
rename from src/app/components/fragments/join-room/join-room.component.spec.ts
rename to src/app/components/fragments/room-join/room-join.component.spec.ts
index 511e4a166b50eb9b29237930c9182988839e9c90..8a3a5c3d99bef3ce9526ee000c1d24b3da3f9997 100644
--- a/src/app/components/fragments/join-room/join-room.component.spec.ts
+++ b/src/app/components/fragments/room-join/room-join.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { JoinRoomComponent } from './join-room.component';
+import { JoinRoomComponent } from './room-join.component';
 
 describe('JoinRoomComponent', () => {
   let component: JoinRoomComponent;
diff --git a/src/app/components/fragments/join-room/join-room.component.ts b/src/app/components/fragments/room-join/room-join.component.ts
similarity index 95%
rename from src/app/components/fragments/join-room/join-room.component.ts
rename to src/app/components/fragments/room-join/room-join.component.ts
index e6bf940123ed4b4bae61135fc589a3d74818f5bf..13b43a6beb3d570a604a821f4a1d1ed285e5d006 100644
--- a/src/app/components/fragments/join-room/join-room.component.ts
+++ b/src/app/components/fragments/room-join/room-join.component.ts
@@ -16,8 +16,8 @@ export class JoinErrorStateMatcher implements ErrorStateMatcher {
 
 @Component({
   selector: 'app-join-room',
-  templateUrl: './join-room.component.html',
-  styleUrls: ['./join-room.component.scss']
+  templateUrl: './room-join.component.html',
+  styleUrls: ['./room-join.component.scss']
 })
 export class JoinRoomComponent implements OnInit {