diff --git a/src/app/content-creation/content-creation.component.ts b/src/app/content-creation/content-creation.component.ts
index 86d7ac2246f687b4b7068b403c94e5f8737e16d5..ccef4b7837311782b85e9b9a9f90150945fdf12c 100644
--- a/src/app/content-creation/content-creation.component.ts
+++ b/src/app/content-creation/content-creation.component.ts
@@ -45,7 +45,7 @@ export class ContentCreationComponent implements OnInit {
     this.contentService.addContent({ subject: subject, body: body, roomId: this.roomId } as Content)
       .subscribe(content => {
         this.notification.show(`Content '${content.subject}' successfully created.`);
-        this.router.navigate([`/creator/room/${content.roomId}/${content.id}`]);
+        this.router.navigate([`/creator/room/${content.roomId}/${content.contentId}`]);
         this.dialogRef.close();
       });
   }
diff --git a/src/app/content-detail/content-detail.component.html b/src/app/content-detail/content-detail.component.html
index 404cab88379b788d3324fb00252102317dca68d7..4e68b015b3d96654881ca18de04b262e651ba43d 100644
--- a/src/app/content-detail/content-detail.component.html
+++ b/src/app/content-detail/content-detail.component.html
@@ -5,7 +5,7 @@
         <mat-card-title>
           <h3 class="subheading-2">{{content.subject}}</h3>
         </mat-card-title>
-        <mat-card-subtitle>ID: {{ content.id }}
+        <mat-card-subtitle>ID: {{ content.contentId }}
           <br> Round: {{ content.round }}</mat-card-subtitle>
       </mat-card-header>
       <mat-divider></mat-divider>
@@ -21,7 +21,7 @@
       <mat-divider></mat-divider>
       <!-- answes list here -->
       <mat-card-actions>
-        <button mat-button color="primary" matTooltip="Create new content" routerLink="/creator/room/{{content.id}}/content-creation">
+        <button mat-button color="primary" matTooltip="Create new content" routerLink="/creator/room/{{content.contentId}}/content-creation">
           Create answer
         </button>
         <button mat-button color="warn" matTooltip="Delete selected answer">
diff --git a/src/app/content-list/content-list.component.html b/src/app/content-list/content-list.component.html
index 4bca2af658745f293e2c9df890fdd22b381b1d4f..ad9cab2ee24959e0d8cd3792b6ca193614cedbb9 100644
--- a/src/app/content-list/content-list.component.html
+++ b/src/app/content-list/content-list.component.html
@@ -1,7 +1,7 @@
 <mat-list>
   <mat-list-item *ngFor="let content of contents">
-    <button mat-button routerLink="{{content.id}}">
-      Content {{content.id}}: {{content.subject}}
+    <button mat-button routerLink="{{content.contentId}}">
+      Content {{content.contentId}}: {{content.subject}}
     </button>
   </mat-list-item>
 </mat-list>
diff --git a/src/app/content.ts b/src/app/content.ts
index 7a6e26199f16e3125441a0209163622221c9136b..27517fe7bf7d7182b538fc26db0eab19c013a435 100644
--- a/src/app/content.ts
+++ b/src/app/content.ts
@@ -1,7 +1,7 @@
 import { ContentType } from './content-type';
 
 export class Content {
-  id: string;
+  contentId: string;
   revision: string;
   roomId: string;
   subject: string;