diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 66b562f9c79fdd5fa017433e032c4dc10d7a1e8e..3e5072769adae2e8c4177386b4dffac96a1eacc8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { JoinRoomComponent } from './join-room/join-room.component';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 import { PasswordResetComponent } from './password-reset/password-reset.component';
-import { CommentCreatorComponent } from './comment-creator/comment-creator.component';
+import { CommentComponent } from './comment/comment.component';
 
 import { AppRoutingModule } from './app-routing.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -77,7 +77,7 @@ import { CreateCommentComponent } from './create-comment/create-comment.componen
     RoomListComponent,
     CreatorHomeScreenComponent,
     CreateCommentComponent,
-    CommentCreatorComponent
+    CommentComponent
   ],
   entryComponents: [
     RegisterComponent,
diff --git a/src/app/comment-creator/comment-creator.component.ts b/src/app/comment-creator/comment-creator.component.ts
deleted file mode 100644
index 168d0662d0b053cc6c5150bf914a4a5198670f7a..0000000000000000000000000000000000000000
--- a/src/app/comment-creator/comment-creator.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-comment-creator',
-  templateUrl: './comment-creator.component.html',
-  styleUrls: ['./comment-creator.component.scss']
-})
-export class CommentCreatorComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/src/app/comment-creator/comment-creator.component.html b/src/app/comment/comment.component.html
similarity index 100%
rename from src/app/comment-creator/comment-creator.component.html
rename to src/app/comment/comment.component.html
diff --git a/src/app/comment-creator/comment-creator.component.scss b/src/app/comment/comment.component.scss
similarity index 100%
rename from src/app/comment-creator/comment-creator.component.scss
rename to src/app/comment/comment.component.scss
diff --git a/src/app/comment-creator/comment-creator.component.spec.ts b/src/app/comment/comment.component.spec.ts
similarity index 52%
rename from src/app/comment-creator/comment-creator.component.spec.ts
rename to src/app/comment/comment.component.spec.ts
index 4f2088ee8b9dc72be419f5a4e7f4dd264c0af3c5..bcac3f25f13c3e3be6e4741ef17af9dcc8e4accf 100644
--- a/src/app/comment-creator/comment-creator.component.spec.ts
+++ b/src/app/comment/comment.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CommentCreatorComponent } from './comment-creator.component';
+import { CommentComponent } from './comment.component';
 
-describe('CommentCreatorComponent', () => {
-  let component: CommentCreatorComponent;
-  let fixture: ComponentFixture<CommentCreatorComponent>;
+describe('CommentComponent', () => {
+  let component: CommentComponent;
+  let fixture: ComponentFixture<CommentComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CommentCreatorComponent ]
+      declarations: [ CommentComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CommentCreatorComponent);
+    fixture = TestBed.createComponent(CommentComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/comment/comment.component.ts b/src/app/comment/comment.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0d47e825d4e55f6c6e68180b96b3b83a32b75270
--- /dev/null
+++ b/src/app/comment/comment.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-comment',
+  templateUrl: './comment.component.html',
+  styleUrls: ['./comment.component.scss']
+})
+export class CommentComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}