diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index d890efcf..9c91d2ac 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -1,7 +1,7 @@
 <div>
 	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	<i class="hostmask">({{whois.user}}@{{whois.host}})</i>:
-	<b>{{whois.realname}}</b>
+	<b>{{whois.real_name}}</b>
 </div>
 {{#if whois.account}}
 <div>
diff --git a/package.json b/package.json
index 35c97db1..4a70004f 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "event-stream": "3.3.2",
     "express": "4.13.4",
     "lodash": "4.6.1",
-    "irc-framework": "1.0.3",
+    "irc-framework": "1.0.4",
     "mkdirp": "0.5.1",
     "moment": "2.12.0",
     "read": "1.0.7",
diff --git a/src/plugins/irc-events/ctcp.js b/src/plugins/irc-events/ctcp.js
index e329a4d3..b2db7973 100644
--- a/src/plugins/irc-events/ctcp.js
+++ b/src/plugins/irc-events/ctcp.js
@@ -7,7 +7,7 @@ module.exports = function(irc/* , network */) {
 			irc.ctcpResponse(data.nick, "VERSION " + pkg.name + " " + pkg.version);
 			break;
 		case "PING":
-			var split = data.msg.split(" ");
+			var split = data.message.split(" ");
 			if (split.length === 2) {
 				irc.ctcpResponse(data.nick, "PING " + split[1]);
 			}
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index dd20e1fd..b0c1c7fc 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -51,7 +51,7 @@ module.exports = function(irc, network) {
 
 		// Self messages are never highlighted
 		// Non-self messages are highlighted as soon as the nick is detected
-		var highlight = !self && data.msg.split(" ").some(function(w) {
+		var highlight = !self && data.message.split(" ").some(function(w) {
 			return (w.replace(/^@/, "").toLowerCase().indexOf(irc.user.nick.toLowerCase()) === 0);
 		});
 
@@ -68,7 +68,7 @@ module.exports = function(irc, network) {
 			time: data.time,
 			mode: chan.getMode(data.nick),
 			from: data.nick,
-			text: data.msg,
+			text: data.message,
 			self: self,
 			highlight: highlight
 		});