diff --git a/src/app/creator-room/creator-room.component.html b/src/app/creator-room/creator-room.component.html
index 56389ecab526b845e08701191c7e9de681738915..9c82c86740615d3b1ee9023cb986ac950b36cfc6 100644
--- a/src/app/creator-room/creator-room.component.html
+++ b/src/app/creator-room/creator-room.component.html
@@ -29,9 +29,8 @@
                 routerLink="/creator/room/{{room.id}}/comments">
           Comments
         </button>
-        <button *ngIf="!modify" (click)="showEditDialog()" mat-button color="primary"
-                matTooltip="Modify room's details">
-          Modify room
+        <button *ngIf="!modify" (click)="showEditDialog()" mat-button color="primary">
+          Edit room
         </button>
         <button *ngIf="modify" (click)="updateRoom(roomName.valueOf(), roomShortID.valueOf(), roomDescription.valueOf())" mat-button color="primary" matTooltip="Update room's details">
           Update room
@@ -62,10 +61,10 @@
         </mat-form-field>
       </mat-card-content>
       <mat-card-actions>
-        <button (click)="hideEditDialog()" mat-button color="primary" matTooltip="Leave modification-dialog">
+        <button (click)="hideEditDialog()" mat-button color="primary">
           Leave
         </button>
-        <button (click)="updateRoom()" mat-button color="primary" matTooltip="Update properties">
+        <button (click)="updateRoom()" mat-button color="primary">
           Update
         </button>
       </mat-card-actions>