diff --git a/src/app/party.coffee b/src/app/party.coffee
index 3a7a16d5fa..7205c55569 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -116,14 +116,14 @@ module.exports.app = (appExports, model, app) ->
         chat.remove(200)
 
   model.on 'unshift', '_party.chat', -> $('.chat-message').tooltip()
-  model.on 'unshift', '_tavern.chat.messages', -> $('.chat-message').tooltip()
+  model.on 'unshift', '_habitrpg.chat', -> $('.chat-message').tooltip()
 
   appExports.partySendChat = ->
     sendChat('_party.chat', '_chatMessage')
     model.set '_user.party.lastMessageSeen', model.get('_party.chat')[0].id
 
   appExports.tavernSendChat = ->
-    sendChat('_tavern.chat.messages', '_tavernMessage')
+    sendChat('_habitRPG.chat', '_tavernMessage')
 
   appExports.partyMessageKeyup = (e, el, next) ->
     return next() unless e.keyCode is 13
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index c3d02cffda..b7c1ff4036 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -131,7 +131,7 @@
             </div>
 
             <ul class='unstyled tavern-chat'>
-                {#each _tavern.chat.messages as :message}
+                {#each _habitRPG.chat as :message}
                     <app:groups:chat-message message={{:message}} />
                 {/}
             </ul>