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}}
Host mask:
- {{whois.user}}@{{whois.host}}
+ {{whois.ident}}@{{whois.hostname}}
-{{#if whois.actualhost}}
+{{#if whois.actual_hostname}}
Actual host:
- {{whois.actualip}}{{#notEqual whois.actualhost whois.actualip}} ({{whois.actualhost}}){{/notEqual}}
+ {{whois.actual_ip}}{{#notEqual whois.actual_hostname whois.actual_ip}} ({{whois.actual_hostname}}){{/notEqual}}
{{/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,
});