diff --git a/docs/docs_client.rst b/docs/docs_client.rst
index d20b5d2b0..7d82fcb00 100644
--- a/docs/docs_client.rst
+++ b/docs/docs_client.rst
@@ -874,4 +874,4 @@ Emitted when a user leaves a voice channel, supplies a VoiceChannel_ and a User_
 voiceStateUpdate
 ~~~~~~~~~~
 
-Emitted when a user mutes/deafens, supplies a VoiceChannel_, User_, an object containing the old mute/self_mute/deaf/self_deaf properties, and an object containing the new mute/self_mute/deaf/self_deaf properties
+Emitted when a user mutes/deafens, supplies a VoiceChannel_, User_, an object containing the old mute/selfMute/deaf/selfDeaf properties, and an object containing the new mute/selfMute/deaf/selfDeaf properties
diff --git a/docs/docs_server.rst b/docs/docs_server.rst
index 29600efa5..539f2d832 100644
--- a/docs/docs_server.rst
+++ b/docs/docs_server.rst
@@ -109,9 +109,9 @@ Returns an object containing metadata of a user within the server, containing a
 		joinedAt: 1449339323747,
 		roles: [],
 		mute: false,
-		self_mute: false,
+		selfMute: false,
 		deaf: false,
-		self_deaf: false
+		selfDeaf: false
 	}
 
 leave()
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index efc606455..5694da3bc 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -231,14 +231,14 @@ var Server = (function (_Equality) {
 		}
 		var oldState = {
 			mute: this.memberMap[user.id].mute,
-			self_mute: this.memberMap[user.id].self_mute,
+			selfMute: this.memberMap[user.id].self_mute,
 			deaf: this.memberMap[user.id].deaf,
-			self_deaf: this.memberMap[user.id].self_deaf
+			selfDeaf: this.memberMap[user.id].self_deaf
 		};
 		this.memberMap[user.id].mute = data.mute;
-		this.memberMap[user.id].self_mute = data.self_mute;
+		this.memberMap[user.id].selfMute = data.self_mute;
 		this.memberMap[user.id].deaf = data.deaf;
-		this.memberMap[user.id].self_deaf = data.self_deaf;
+		this.memberMap[user.id].selfDeaf = data.self_deaf;
 		if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute || oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) {
 			this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]);
 		} else {
diff --git a/src/Structures/Server.js b/src/Structures/Server.js
index 64f8360af..9e21fb9dc 100644
--- a/src/Structures/Server.js
+++ b/src/Structures/Server.js
@@ -194,14 +194,14 @@ export default class Server extends Equality {
 		}
 		var oldState = {
 			mute: this.memberMap[user.id].mute,
-			self_mute: this.memberMap[user.id].self_mute,
+			selfMute: this.memberMap[user.id].self_mute,
 			deaf: this.memberMap[user.id].deaf,
-			self_deaf: this.memberMap[user.id].self_deaf
+			selfDeaf: this.memberMap[user.id].self_deaf
 		};
 		this.memberMap[user.id].mute = data.mute;
-		this.memberMap[user.id].self_mute = data.self_mute;
+		this.memberMap[user.id].selfMute = data.self_mute;
 		this.memberMap[user.id].deaf = data.deaf;
-		this.memberMap[user.id].self_deaf = data.self_deaf;
+		this.memberMap[user.id].selfDeaf = data.self_deaf;
 		if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute
 			|| oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) {
 			this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]);