Rename Server to Guild everywhere.

1 files changed, 6 insertions, 6 deletions

diff --git a/discord/http.py b/discord/http.py
index 38b7ff8e..3b957a16 100644
--- a/discord/http.py
+++ b/discord/http.py
@@ -341,7 +341,7 @@ class HTTPClient:
         url = '{0.GUILDS}/{1}/bans/{2}'.format(self, guild_id, user_id)
         return self.delete(url, bucket=_func_())
 
-    def server_voice_state(self, user_id, guild_id, *, mute=None, deafen=None):
+    def guild_voice_state(self, user_id, guild_id, *, mute=None, deafen=None):
         url = '{0.GUILDS}/{1}/members/{2}'.format(self, guild_id, user_id)
         payload = {}
         if mute is not None:
@@ -411,17 +411,17 @@ class HTTPClient:
         url = '{0.CHANNELS}/{1}'.format(self, channel_id)
         return self.delete(url, bucket=_func_())
 
-    # Server management
+    # Guild management
 
-    def leave_server(self, guild_id):
+    def leave_guild(self, guild_id):
         url = '{0.USERS}/@me/guilds/{1}'.format(self, guild_id)
         return self.delete(url, bucket=_func_())
 
-    def delete_server(self, guild_id):
+    def delete_guild(self, guild_id):
         url = '{0.GUILDS}/{1}'.format(self, guild_id)
         return self.delete(url, bucket=_func_())
 
-    def create_server(self, name, region, icon):
+    def create_guild(self, name, region, icon):
         payload = {
             'name': name,
             'icon': icon,
@@ -430,7 +430,7 @@ class HTTPClient:
 
         return self.post(self.GUILDS, json=payload, bucket=_func_())
 
-    def edit_server(self, guild_id, **fields):
+    def edit_guild(self, guild_id, **fields):
         valid_keys = ('name', 'region', 'icon', 'afk_timeout', 'owner_id',
                       'afk_channel_id', 'splash', 'verification_level')