diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index f1e15881..c19d4a6b 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -6,11 +6,11 @@
 {{/if}}
 
 	<dt>Host mask:</dt>
-	<dd class="hostmask">{{whois.user}}@{{whois.host}}</dd>
+	<dd class="hostmask">{{whois.ident}}@{{whois.hostname}}</dd>
 
-{{#if whois.actualhost}}
+{{#if whois.actual_hostname}}
 	<dt>Actual host:</dt>
-	<dd class="hostmask"><a href="https://ipinfo.io/{{whois.actualip}}" target="_blank" rel="noopener">{{whois.actualip}}</a>{{#notEqual whois.actualhost whois.actualip}} ({{whois.actualhost}}){{/notEqual}}</dd>
+	<dd class="hostmask"><a href="https://ipinfo.io/{{whois.actual_ip}}" target="_blank" rel="noopener">{{whois.actual_ip}}</a>{{#notEqual whois.actual_hostname whois.actual_ip}} ({{whois.actual_hostname}}){{/notEqual}}</dd>
 {{/if}}
 
 {{#if whois.real_name}}
diff --git a/src/plugins/irc-events/chghost.js b/src/plugins/irc-events/chghost.js
index b6e458fa..0be9d775 100644
--- a/src/plugins/irc-events/chghost.js
+++ b/src/plugins/irc-events/chghost.js
@@ -19,7 +19,7 @@ module.exports = function(irc, network) {
 				time: data.time,
 				type: Msg.Type.CHGHOST,
 				new_ident: data.ident !== data.new_ident ? data.new_ident : "",
-				new_host: data.hostname !== data.new_host ? data.new_host : "",
+				new_host: data.hostname !== data.new_hostname ? data.new_hostname : "",
 				self: data.nick === irc.user.nick,
 				from: user,
 			});