diff --git a/Game/Entities/Creature/Gossip.cs b/Game/Entities/Creature/Gossip.cs
index 7020fbc51..6976af86b 100644
--- a/Game/Entities/Creature/Gossip.cs
+++ b/Game/Entities/Creature/Gossip.cs
@@ -315,9 +315,9 @@ namespace Game.Misc
             _session.SendPacket(packet);
         }
 
-        public void SendQuestGiverQuestList(ObjectGuid guid)
+        public void SendQuestGiverQuestListMessage(ObjectGuid guid)
         {
-            QuestGiverQuestList questList = new QuestGiverQuestList();
+            QuestGiverQuestListMessage questList = new QuestGiverQuestListMessage();
             questList.QuestGiverGUID = guid;
 
             QuestGreeting questGreeting = Global.ObjectMgr.GetQuestGreeting(guid);
@@ -348,7 +348,7 @@ namespace Game.Misc
                             ObjectManager.GetLocaleString(localeData.LogTitle, locale, ref title);
                     }
 
-                    GossipTextData text = new GossipTextData();
+                    GossipText text = new GossipText();
                     text.QuestID = questID;
                     text.QuestType = questMenuItem.QuestIcon;
                     text.QuestLevel = (uint)quest.Level;
@@ -356,7 +356,7 @@ namespace Game.Misc
                     text.QuestFlagsEx = (uint)quest.FlagsEx;
                     text.Repeatable = false; // NYI
                     text.QuestTitle = title;
-                    questList.GossipTexts.Add(text);
+                    questList.QuestDataText.Add(text);
                 }
             }
 
diff --git a/Game/Entities/Player/Player.Quest.cs b/Game/Entities/Player/Player.Quest.cs
index 889af0f7e..24c0ae009 100644
--- a/Game/Entities/Player/Player.Quest.cs
+++ b/Game/Entities/Player/Player.Quest.cs
@@ -321,7 +321,7 @@ namespace Game.Entities
                 }
             }
 
-            PlayerTalkClass.SendQuestGiverQuestList(guid);
+            PlayerTalkClass.SendQuestGiverQuestListMessage(guid);
         }
 
         public bool IsActiveQuest(uint quest_id)
diff --git a/Game/Globals/ObjectManager.cs b/Game/Globals/ObjectManager.cs
index ea0afb38e..63ed00f05 100644
--- a/Game/Globals/ObjectManager.cs
+++ b/Game/Globals/ObjectManager.cs
@@ -6175,7 +6175,7 @@ namespace Game
 
             // Load `quest_objectives`
             //                               0   1        2     3             4         5       6      7      8                  9
-            result = DB.World.Query("SELECT ID, QuestID, Type, StorageIndex, ObjectID, Amount, Flags, Flags2, ProgressBarWeight, Description FROM quest_objectives ORDER BY StorageIndex ASC");
+            result = DB.World.Query("SELECT ID, QuestID, Type, StorageIndex, ObjectID, Amount, Flags, Flags2, ProgressBarWeight, Description FROM quest_objectives ORDER BY `Order` ASC, StorageIndex ASC");
 
             if (result.IsEmpty())
             {
diff --git a/Game/Network/Packets/QuestPackets.cs b/Game/Network/Packets/QuestPackets.cs
index bf873cfeb..0417147c0 100644
--- a/Game/Network/Packets/QuestPackets.cs
+++ b/Game/Network/Packets/QuestPackets.cs
@@ -600,20 +600,20 @@ namespace Game.Network.Packets
         public byte Entry;
     }
 
-    public class QuestGiverQuestList : ServerPacket
+    public class QuestGiverQuestListMessage : ServerPacket
     {
-        public QuestGiverQuestList() : base(ServerOpcodes.QuestGiverQuestListMessage) { }
+        public QuestGiverQuestListMessage() : base(ServerOpcodes.QuestGiverQuestListMessage) { }
 
         public override void Write()
         {
             _worldPacket.WritePackedGuid(QuestGiverGUID);
             _worldPacket.WriteUInt32(GreetEmoteDelay);
             _worldPacket.WriteUInt32(GreetEmoteType);
-            _worldPacket.WriteUInt32(GossipTexts.Count);
+            _worldPacket.WriteUInt32(QuestDataText.Count);
             _worldPacket.WriteBits(Greeting.Length, 11);
             _worldPacket.FlushBits();
 
-            foreach (GossipTextData gossip in GossipTexts)
+            foreach (GossipText gossip in QuestDataText)
             {
                 _worldPacket.WriteUInt32(gossip.QuestID);
                 _worldPacket.WriteUInt32(gossip.QuestType);
@@ -634,7 +634,7 @@ namespace Game.Network.Packets
         public ObjectGuid QuestGiverGUID;
         public uint GreetEmoteDelay;
         public uint GreetEmoteType;
-        public List<GossipTextData> GossipTexts = new List<GossipTextData>();
+        public List<GossipText> QuestDataText = new List<GossipText>();
         public string Greeting = "";
     }
 
@@ -1086,9 +1086,9 @@ namespace Game.Network.Packets
         public int Amount;
     }
 
-    public struct GossipTextData
+    public struct GossipText
     {
-        public GossipTextData(uint questID, uint questType, uint questLevel, uint questFlags, uint questFlagsEx, bool repeatable, string questTitle)
+        public GossipText(uint questID, uint questType, uint questLevel, uint questFlags, uint questFlagsEx, bool repeatable, string questTitle)
         {
             QuestID = questID;
             QuestType = questType;