diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 0bcec1833e0dfd59f945609cc8b1c3cb67617367..4744918af5978f0d7273281dbaa622821ea17652 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PageNotFoundPageComponent } from './components/pages/page-not-found-page/page-not-found-page.component';
-import { LoginComponentPage } from './components/pages/login-page/login-page.component';
+import { LoginComponentPageComponent } from './components/pages/login-page/login-page.component';
 import { HomeCreatorPageComponent } from './components/pages/home-creator-page/home-creator-page.component';
 import { CommentCreatePageComponent } from './components/pages/comment-create-page/comment-create-page.component';
 import { HomeParticipantPageComponent } from './components/pages/home-participant-page/home-participant-page.component';
@@ -25,7 +25,7 @@ const routes: Routes = [
   },
   {
     path: 'home',
-    component: LoginComponentPage
+    component: LoginComponentPageComponent
   },
   {
     path: 'creator',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 54bb93ed7cca1148910679dea0dab576c49ac779..e3397a5b8ddc827fc41f5f72ff0c50fe01bb879c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -48,7 +48,7 @@ import {
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { RoomPageComponent } from './components/pages/room-page/room-page.component';
 import { RoomCreateComponent } from './components/dialogs/room-create/room-create.component';
-import { LoginComponentPage } from './components/pages/login-page/login-page.component';
+import { LoginComponentPageComponent } from './components/pages/login-page/login-page.component';
 import { NotificationService } from './services/util/notification.service';
 import { AuthenticationService } from './services/http/authentication.service';
 import { AuthenticationGuard } from './guards/authentication.guard';
@@ -83,7 +83,7 @@ import { AuthenticationInterceptor } from './interceptors/authentication.interce
     AppComponent,
     RoomJoinComponent,
     AppComponent,
-    LoginComponentPage,
+    LoginComponentPageComponent,
     LoginComponent,
     PageNotFoundPageComponent,
     PasswordResetComponent,
diff --git a/src/app/components/fragments/login/login.component.spec.ts b/src/app/components/fragments/login/login.component.spec.ts
index d79ec79b90b68172edf05e7674543bc42c1c6534..cfa3c49d397bafa9fc77c0bda1272a6d5a1ac17a 100644
--- a/src/app/components/fragments/login/login.component.spec.ts
+++ b/src/app/components/fragments/login/login.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoginComponent } from './login.component';
 
-describe('LoginComponentPage', () => {
+describe('LoginComponentPageComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
 
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.html b/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
index 38bc1431a8faf7ca7e2bc54dd22147ac8f0051d3..c256a384463275428b63acc6dacdfbc639fe2f09 100644
--- a/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
@@ -9,12 +9,12 @@
       -->
       <mat-tab label="Text">
         <div class="tab-container">
-          <app-participant-text-content></app-participant-text-content>
+          <app-content-text-participant></app-content-text-participant>
         </div>
       </mat-tab>
       <mat-tab label="Choice">
         <div class="tab-container">
-          <app-participant-choice-content></app-participant-choice-content>
+          <app-content-choice-participant></app-content-choice-participant>
         </div>
       </mat-tab>
     </mat-tab-group>
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.html b/src/app/components/pages/content-create-page/content-create-page.component.html
index e550777572e74d629849fbe321e6c6d8dbcf66dd..a6cf4afcde44f4fd2df514da2269471ccff1c470 100644
--- a/src/app/components/pages/content-create-page/content-create-page.component.html
+++ b/src/app/components/pages/content-create-page/content-create-page.component.html
@@ -3,12 +3,12 @@
     <mat-tab-group>
       <mat-tab label="Text">
         <div class="tab-container">
-          <app-creator-text-content></app-creator-text-content>
+          <app-content-text-creator></app-content-text-creator>
         </div>
       </mat-tab>
       <mat-tab label="Choice">
         <div class="tab-container">
-          <app-creator-choice-content></app-creator-choice-content>
+          <app-content-choice-creator></app-content-choice-creator>
         </div>
       </mat-tab>
     </mat-tab-group>
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.html b/src/app/components/pages/home-participant-page/home-participant-page.component.html
index 68e3b6b6f7a4e66264dcef86e48b8c528092019c..4e955fc36d7d2c54cda384e720179525ecd90031 100644
--- a/src/app/components/pages/home-participant-page/home-participant-page.component.html
+++ b/src/app/components/pages/home-participant-page/home-participant-page.component.html
@@ -1,6 +1,6 @@
 <div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
   <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
-    <app-join-room></app-join-room>
+    <app-room-join></app-room-join>
   </div>
   <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
     <app-room-list></app-room-list>
diff --git a/src/app/components/pages/login-page/login-page.component.spec.ts b/src/app/components/pages/login-page/login-page.component.spec.ts
index fc0471ca5a3819d1a476ee5ce9c739124fe4879b..75f15ff25d55fad1e0ed9face864cee51c84e4c9 100644
--- a/src/app/components/pages/login-page/login-page.component.spec.ts
+++ b/src/app/components/pages/login-page/login-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { LoginComponentPage } from './login-page.component';
+import { LoginComponentPageComponent } from './login-page.component';
 
-describe('LoginComponentPage', () => {
-  let component: LoginComponentPage;
-  let fixture: ComponentFixture<LoginComponentPage>;
+describe('LoginComponentPageComponent', () => {
+  let component: LoginComponentPageComponent;
+  let fixture: ComponentFixture<LoginComponentPageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ LoginComponentPage ]
+      declarations: [ LoginComponentPageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(LoginComponentPage);
+    fixture = TestBed.createComponent(LoginComponentPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/components/pages/login-page/login-page.component.ts b/src/app/components/pages/login-page/login-page.component.ts
index 9bc4b4e8ecb1f3ad03aae5d665d8da8399654622..ec893d5c1b26927d1e1b64f2fc133452ce8e16ff 100644
--- a/src/app/components/pages/login-page/login-page.component.ts
+++ b/src/app/components/pages/login-page/login-page.component.ts
@@ -9,7 +9,7 @@ import { UserRole } from '../../../models/user-roles.enum';
   templateUrl: './login-page.component.html',
   styleUrls: ['./login-page.component.scss']
 })
-export class LoginComponentPage implements OnInit {
+export class LoginComponentPageComponent implements OnInit {
   // Make UserRole available to the template
   UserRole = UserRole;