diff --git a/data/sql/updates/pending_db_world/rev_1537827596332623300.sql b/data/sql/updates/pending_db_world/rev_1537827596332623300.sql
new file mode 100644
index 000000000..41b8af102
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1537827596332623300.sql
@@ -0,0 +1,17 @@
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1537827596332623300');
+DELETE FROM `command` WHERE `name`='go gobject';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES ('go gobject', 1, 'Syntax: .go object #gameobject_guid\r\nTeleport your character to gameobject with guid #gameobject_guid');
+DELETE FROM `command` WHERE `name`='list gobject';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES ('list gobject', 1, 'Syntax: .list object #gameobject_id [#max_count]\r\n\r\nOutput gameobjects with gameobject id #gameobject_id found in world. Output gameobject guids and coordinates sorted by distance from character. Will be output maximum #max_count gameobject. If #max_count not provided use 10 as default value.');
+DELETE FROM `command` WHERE `name`='lookup gobject';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES ('lookup gobject', 1, 'Syntax: .lookup object $objname\r\n\r\nLooks up an gameobject by $objname, and returns all matches with their Gameobject ID\'s.');
+
+-- Add deprecated notice
+UPDATE `command` SET `help` = '[DEPRECATED]: use ".go gobject" instead.\r\nSyntax: .go object #object_guid\r\nTeleport your character to gameobject with guid #object_guid'
+WHERE `name` = 'go object' COLLATE utf8mb4_bin;
+
+UPDATE `command` SET `help` = '[DEPRECATED]: use ".lookup gobject" instead.\r\nSyntax: .go object #object_guid\r\nTeleport your character to gameobject with guid #object_guid'
+WHERE `name` = 'lookup object' COLLATE utf8mb4_bin;
+
+UPDATE `command` SET `help` = '[DEPRECATED]: use ".list gobject" instead.\r\nSyntax: .go object #object_guid\r\nTeleport your character to gameobject with guid #object_guid'
+WHERE `name` = 'list object' COLLATE utf8mb4_bin;
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index bde920ec0..c8913b6f5 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -32,6 +32,7 @@ public:
             { "graveyard",      SEC_MODERATOR,      false, &HandleGoGraveyardCommand,         "" },
             { "grid",           SEC_MODERATOR,      false, &HandleGoGridCommand,              "" },
             { "object",         SEC_MODERATOR,      false, &HandleGoObjectCommand,            "" },
+            { "gobject",        SEC_MODERATOR,      false, &HandleGoObjectCommand,            "" },
             { "taxinode",       SEC_MODERATOR,      false, &HandleGoTaxinodeCommand,          "" },
             { "trigger",        SEC_MODERATOR,      false, &HandleGoTriggerCommand,           "" },
             { "zonexy",         SEC_MODERATOR,      false, &HandleGoZoneXYCommand,            "" },
diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index a7c1144ee..568557087 100644
--- a/src/server/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
@@ -31,6 +31,7 @@ public:
             { "creature",       SEC_MODERATOR,  true,  &HandleListCreatureCommand,          "" },
             { "item",           SEC_MODERATOR,  true,  &HandleListItemCommand,              "" },
             { "object",         SEC_MODERATOR,  true,  &HandleListObjectCommand,            "" },
+            { "gobject",        SEC_MODERATOR,  true,  &HandleListObjectCommand,            "" },
             { "auras",          SEC_MODERATOR,  false, &HandleListAurasCommand,             "" }
         };
         static std::vector<ChatCommand> commandTable =
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index 3743aecf7..f92c0fae9 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -43,21 +43,22 @@ public:
 
         static std::vector<ChatCommand> lookupCommandTable =
         {
-            { "area",           SEC_MODERATOR,      true,  &HandleLookupAreaCommand,            "" },
-            { "creature",       SEC_MODERATOR,      true,  &HandleLookupCreatureCommand,        "" },
-            { "event",          SEC_MODERATOR,      true,  &HandleLookupEventCommand,           "" },
-            { "faction",        SEC_MODERATOR,      true,  &HandleLookupFactionCommand,         "" },
-            { "item",           SEC_MODERATOR,      true,  &HandleLookupItemCommand,            "" },
-            { "itemset",        SEC_MODERATOR,      true,  &HandleLookupItemSetCommand,         "" },
-            { "object",         SEC_MODERATOR,      true,  &HandleLookupObjectCommand,          "" },
-            { "quest",          SEC_MODERATOR,      true,  &HandleLookupQuestCommand,           "" },
-            { "player",         SEC_GAMEMASTER,     true,  nullptr,                                "", lookupPlayerCommandTable },
-            { "skill",          SEC_MODERATOR,      true,  &HandleLookupSkillCommand,           "" },
-            { "spell",          SEC_MODERATOR,      true,  nullptr,                                "", lookupSpellCommandTable },
-            { "taxinode",       SEC_MODERATOR,      true,  &HandleLookupTaxiNodeCommand,        "" },
-            { "tele",           SEC_MODERATOR,      true,  &HandleLookupTeleCommand,            "" },
-            { "title",          SEC_MODERATOR,      true,  &HandleLookupTitleCommand,           "" },
-            { "map",            SEC_MODERATOR,      true,  &HandleLookupMapCommand,             "" }
+            { "area",           SEC_MODERATOR,      true,  &HandleLookupAreaCommand,        "" },
+            { "creature",       SEC_MODERATOR,      true,  &HandleLookupCreatureCommand,    "" },
+            { "event",          SEC_MODERATOR,      true,  &HandleLookupEventCommand,       "" },
+            { "faction",        SEC_MODERATOR,      true,  &HandleLookupFactionCommand,     "" },
+            { "item",           SEC_MODERATOR,      true,  &HandleLookupItemCommand,        "" },
+            { "itemset",        SEC_MODERATOR,      true,  &HandleLookupItemSetCommand,     "" },
+            { "object",         SEC_MODERATOR,      true,  &HandleLookupObjectCommand,      "" },
+            { "gobject",        SEC_MODERATOR,      true,  &HandleLookupObjectCommand,      "" },
+            { "quest",          SEC_MODERATOR,      true,  &HandleLookupQuestCommand,       "" },
+            { "skill",          SEC_MODERATOR,      true,  &HandleLookupSkillCommand,       "" },
+            { "taxinode",       SEC_MODERATOR,      true,  &HandleLookupTaxiNodeCommand,    "" },
+            { "tele",           SEC_MODERATOR,      true,  &HandleLookupTeleCommand,        "" },
+            { "title",          SEC_MODERATOR,      true,  &HandleLookupTitleCommand,       "" },
+            { "map",            SEC_MODERATOR,      true,  &HandleLookupMapCommand,         "" },
+            { "player",         SEC_GAMEMASTER,     true,  nullptr, "", lookupPlayerCommandTable },
+            { "spell",          SEC_MODERATOR,      true,  nullptr, "", lookupSpellCommandTable }
         };
 
         static std::vector<ChatCommand> commandTable =