diff --git a/src/app/messages/messages.component.html b/src/app/messages/messages.component.html
index 70ffe8a..91789ca 100644
--- a/src/app/messages/messages.component.html
+++ b/src/app/messages/messages.component.html
@@ -12,10 +12,10 @@
 
       <div class="tfw-message-btn-divider"></div>
       <div class="tfw-message-btn">
-        <button *ngFor="let button of message.buttons"
-             class="{{button}}"
-             (click)="sendButtonCommand(button)">
-          {{buttonMap[button].caption}}
+        <button *ngFor="let messageButton of message.buttons"
+             class="{{messageButton}}"
+             (click)="sendButtonCommand(messageButton)">
+          {{buttonMap[messageButton].caption}}
         </button>
       </div>
     </div>
diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts
index 86cb161..629d720 100644
--- a/src/app/messages/messages.component.ts
+++ b/src/app/messages/messages.component.ts
@@ -79,10 +79,10 @@ export class MessagesComponent implements OnInit {
     }
   }
 
-  sendButtonCommand(button: string) {
+  sendButtonCommand(messageButton: MessageButton) {
     this.websocketService.send({
-      'key': 'button.click',
-      'value': button
+      'key': 'message.button.click',
+      'value': messageButton
     });
   }
 }