diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 90e82f67b447b698a5e1586c2218d0d396fdfa0e..a4f0e5f10ba071cc42f2bb57fefa8a8be53a9d4e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -15,7 +15,7 @@ import { AnswerStatisticsComponent } from './components/fragments/statistics/sta
 import { AddContentComponent } from './components/pages/content-create/content-create.component';
 import {
   ParticipantContentCarouselPageComponent
-} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+} from './components/pages/content-carousel/content-carousel.component';
 
 const routes: Routes = [
   {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5c15dc801f256d333b41e99dbfdb95c2b03cefe1..4ab46ffa22d75f4608267145b3da603db5925ded 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -76,7 +76,7 @@ import { CreatorChoiceContentComponent } from './components/fragments/content-ch
 import { AddContentComponent } from './components/pages/content-create/content-create.component';
 import {
   ParticipantContentCarouselPageComponent
-} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+} from './components/pages/content-carousel/content-carousel.component';
 import { ParticipantTextContentComponent } from './components/fragments/content-text-participant/content-text-participant.component';
 import { CreatorTextContentComponent } from './components/fragments/content-text-creator/content-text-creator.component';
 import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
index bf2c3b0cdeac2974616462f44c0ab49c805855bb..6b7bb54811d168160e2b5b6b6c82e3bf11ec510d 100644
--- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { AnswerOption } from '../../../models/answer-option';
-import { ChoiceContent } from '../../../models/choice-content';
+import { ChoiceContent } from '../../../models/content-choice';
 import { ContentService } from '../../../services/http/content.service';
 
 export class DisplayAnswer {
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
index 21948e3cf4ab51a9dc6e5f7ffba2908f49b1ed6c..d31e0acb42f6f67340de84f8f0d53674a66c77ca 100644
--- a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
+++ b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ChoiceContent } from '../../../models/choice-content';
+import { ChoiceContent } from '../../../models/content-choice';
 import { AnswerOption } from '../../../models/answer-option';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts b/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
index a822830b6834eb302075157caad215dfdb0033da..c0f6cf42dec39907ba79d87b79841141123e350f 100644
--- a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../../../models/text-content';
+import { TextContent } from '../../../models/content-text';
 import { ContentService } from '../../../services/http/content.service';
 
 @Component({
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.ts b/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
index da27dda59b665deea3db3aff6cacb5201cf8b5da..24d7d7fd3034ee9f01cd83b483a828d99b54e2e3 100644
--- a/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
+++ b/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../../../models/text-content';
+import { TextContent } from '../../../models/content-text';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
 
diff --git a/src/app/components/fragments/statistics/statistics.component.ts b/src/app/components/fragments/statistics/statistics.component.ts
index bef7f2fa706f8e26ba31ed9e402e49efba4c6919..d0a510ce789c728cdc098b0b1bf330f1877f3818 100644
--- a/src/app/components/fragments/statistics/statistics.component.ts
+++ b/src/app/components/fragments/statistics/statistics.component.ts
@@ -5,8 +5,8 @@ import { Content } from '../../../models/content';
 import { ContentService } from '../../../services/http/content.service';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
-import { ChoiceAnswer } from '../../../models/choice-answer';
-import { ContentType } from '../../../models/content-type';
+import { ChoiceAnswer } from '../../../models/answer-choice';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-answer-statistics',
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html b/src/app/components/pages/content-carousel/content-carousel.component.html
similarity index 100%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html
rename to src/app/components/pages/content-carousel/content-carousel.component.html
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss b/src/app/components/pages/content-carousel/content-carousel.component.scss
similarity index 100%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss
rename to src/app/components/pages/content-carousel/content-carousel.component.scss
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts b/src/app/components/pages/content-carousel/content-carousel.component.spec.ts
similarity index 86%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
rename to src/app/components/pages/content-carousel/content-carousel.component.spec.ts
index 6719ec8eee8066dd6204c31b0e0484af2d4dd197..cd52a906115d7af8a58661a5d96c68054633789d 100644
--- a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
+++ b/src/app/components/pages/content-carousel/content-carousel.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ParticipantContentCarouselPageComponent } from './participant-content-carousel-page.component';
+import { ParticipantContentCarouselPageComponent } from './content-carousel.component';
 
 describe('ParticipantContentCarouselPageComponent', () => {
   let component: ParticipantContentCarouselPageComponent;
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts b/src/app/components/pages/content-carousel/content-carousel.component.ts
similarity index 63%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
rename to src/app/components/pages/content-carousel/content-carousel.component.ts
index 4b1460bcf897aa14634887fb09ed34ef1f2a75c2..319d18eac680ce6379d6092a8b9b9bbcb577d793 100644
--- a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
+++ b/src/app/components/pages/content-carousel/content-carousel.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { Content } from '../../../models/content';
-import { ContentType } from '../../../models/content-type';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-participant-content-carousel-page',
-  templateUrl: './participant-content-carousel-page.component.html',
-  styleUrls: ['./participant-content-carousel-page.component.scss']
+  templateUrl: './content-carousel.component.html',
+  styleUrls: ['./content-carousel.component.scss']
 })
 export class ParticipantContentCarouselPageComponent implements OnInit {
   ContentType: ContentType;
diff --git a/src/app/models/choice-answer.ts b/src/app/models/answer-choice.ts
similarity index 100%
rename from src/app/models/choice-answer.ts
rename to src/app/models/answer-choice.ts
diff --git a/src/app/models/choice-content.ts b/src/app/models/content-choice.ts
similarity index 93%
rename from src/app/models/choice-content.ts
rename to src/app/models/content-choice.ts
index a6b26d79d99ff4d25e6b13a4de704991bf420f73..ce8c398358be282749e479424ca0d9d9b9c4b782 100644
--- a/src/app/models/choice-content.ts
+++ b/src/app/models/content-choice.ts
@@ -1,6 +1,6 @@
 import { AnswerOption } from './answer-option';
 import { Content } from './content';
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class ChoiceContent extends Content {
   options: AnswerOption[];
diff --git a/src/app/models/text-content.ts b/src/app/models/content-text.ts
similarity index 88%
rename from src/app/models/text-content.ts
rename to src/app/models/content-text.ts
index 02b7081d50bf41bdcf3a96d8f65b52a714654b90..6f86a6365c16c621833d73af666800737a44925e 100644
--- a/src/app/models/text-content.ts
+++ b/src/app/models/content-text.ts
@@ -1,5 +1,5 @@
 import { Content } from './content';
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class TextContent extends Content {
 
diff --git a/src/app/models/content-type.ts b/src/app/models/content-type.enum.ts
similarity index 100%
rename from src/app/models/content-type.ts
rename to src/app/models/content-type.enum.ts
diff --git a/src/app/models/content.ts b/src/app/models/content.ts
index bcb3b4084cf020253cb527577c37bdee0380b55e..c4a4cf5a39587e838befd65c14a43e4b080fbe06 100644
--- a/src/app/models/content.ts
+++ b/src/app/models/content.ts
@@ -1,4 +1,4 @@
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class Content {
   contentId: string;
diff --git a/src/app/services/http/in-memory-data.service.ts b/src/app/services/http/in-memory-data.service.ts
index c68f6bba438c6f8534f388342f4018de470ca966..815bfe58190177bbd7a623ae25f4e1d1a3d6cd14 100644
--- a/src/app/services/http/in-memory-data.service.ts
+++ b/src/app/services/http/in-memory-data.service.ts
@@ -1,5 +1,5 @@
 import { InMemoryDbService } from 'angular-in-memory-web-api';
-import { ContentType } from '../../models/content-type';
+import { ContentType } from '../../models/content-type.enum';
 
 export class InMemoryDataService implements InMemoryDbService {
   /**