diff --git a/hooks/CreatureHooks.cpp b/hooks/CreatureHooks.cpp
index 07b0783..dcbb9c0 100644
--- a/hooks/CreatureHooks.cpp
+++ b/hooks/CreatureHooks.cpp
@@ -285,7 +285,7 @@ bool Eluna::SpellHit(Creature* me, WorldObject* caster, SpellInfo const* spell)
     START_HOOK_WITH_RETVAL(CREATURE_EVENT_ON_HIT_BY_SPELL, me, false);
     HookPush(me);
     HookPush(caster);
-#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CLASSIC
+#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_CLASSIC || ELUNA_EXPANSION == EXP_TBC)
     HookPush(spell->ID); // Pass spell object?
 #else
     HookPush(spell->Id); // Pass spell object?
@@ -299,7 +299,7 @@ bool Eluna::SpellHitTarget(Creature* me, WorldObject* target, SpellInfo const* s
     START_HOOK_WITH_RETVAL(CREATURE_EVENT_ON_SPELL_HIT_TARGET, me, false);
     HookPush(me);
     HookPush(target);
-#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CLASSIC
+#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_CLASSIC || ELUNA_EXPANSION == EXP_TBC)
     HookPush(spell->ID); // Pass spell object?
 #else
     HookPush(spell->Id); // Pass spell object?
diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h
index d1e5592..f4bb5f4 100644
--- a/methods/Mangos/GlobalMethods.h
+++ b/methods/Mangos/GlobalMethods.h
@@ -468,7 +468,7 @@ namespace LuaGlobalFunctions
         if (!areaEntry)
             return luaL_argerror(E->L, 1, "valid Area or Zone ID expected");
 
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
         E->Push(areaEntry->AreaName_lang[locale]);
 #else
         E->Push(areaEntry->area_name[locale]);
@@ -2087,7 +2087,7 @@ namespace LuaGlobalFunctions
             TaxiPathNodeEntry entry;
 
             // mandatory
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
             entry.ContinentID = E->CHECKVAL<uint32>(start);
             entry.LocX = E->CHECKVAL<float>(start + 1);
             entry.LocY = E->CHECKVAL<float>(start + 2);
@@ -2099,7 +2099,7 @@ namespace LuaGlobalFunctions
             entry.z = E->CHECKVAL<float>(start + 3);
 #endif
             // optional
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
             entry.Flags = E->CHECKVAL<uint32>(start + 4, 0);
             entry.Delay = E->CHECKVAL<uint32>(start + 5, 0);
 #else
@@ -2137,11 +2137,15 @@ namespace LuaGlobalFunctions
             TaxiPathNodeEntry& entry = *it;
             TaxiNodesEntry* nodeEntry = new TaxiNodesEntry();
 
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
             entry.PathID = pathId;
             entry.NodeIndex = nodeId;
             nodeEntry->ID = index;
+#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
+            nodeEntry->ContinentID = entry.ContinentID;
+#else
             nodeEntry->map_id = entry.ContinentID;
+#endif
             nodeEntry->x = entry.LocX;
             nodeEntry->y = entry.LocY;
             nodeEntry->z = entry.LocZ;
@@ -2168,7 +2172,11 @@ namespace LuaGlobalFunctions
         pathEntry->from = startNode;
         pathEntry->to = nodeId - 1;
         pathEntry->price = price;
+#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
+        pathEntry->Id = pathId;
+#else
         pathEntry->ID = pathId;
+#endif
         sTaxiPathStore.SetEntry(pathId, pathEntry);
 
         E->Push(pathId);
diff --git a/methods/Mangos/ItemMethods.h b/methods/Mangos/ItemMethods.h
index b1928c3..baed007 100644
--- a/methods/Mangos/ItemMethods.h
+++ b/methods/Mangos/ItemMethods.h
@@ -271,13 +271,21 @@ namespace LuaItem
             {
                 const ItemRandomSuffixEntry* itemRandEntry = sItemRandomSuffixStore.LookupEntry(-item->GetItemRandomPropertyId());
                 if (itemRandEntry)
+#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
+                    suffix = itemRandEntry->Name_lang;
+#else
                     suffix = itemRandEntry->nameSuffix;
+#endif
             }
             else
             {
                 const ItemRandomPropertiesEntry* itemRandEntry = sItemRandomPropertiesStore.LookupEntry(item->GetItemRandomPropertyId());
                 if (itemRandEntry)
+#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
+                    suffix = itemRandEntry->Name_lang;
+#else
                     suffix = itemRandEntry->nameSuffix;
+#endif
             }
             if (suffix)
             {
diff --git a/methods/Mangos/PlayerMethods.h b/methods/Mangos/PlayerMethods.h
index 16282ee..e36c0c5 100644
--- a/methods/Mangos/PlayerMethods.h
+++ b/methods/Mangos/PlayerMethods.h
@@ -2078,7 +2078,11 @@ namespace LuaPlayer
 
         WorldPacket data(MSG_AUCTION_HELLO, 12);
         data << unit->GET_GUID();
+#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
+        data << uint32(ahEntry->ID);
+#else
         data << uint32(ahEntry->houseId);
+#endif
         data << uint8(1);
 
         player->GetSession()->SendPacket(&data);
@@ -2978,7 +2982,7 @@ namespace LuaPlayer
         {
             if (SkillLineEntry const* entry = sSkillLineStore.LookupEntry(i))
             {
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
                 if (entry->CategoryID == SKILL_CATEGORY_LANGUAGES || entry->CategoryID == SKILL_CATEGORY_GENERIC)
                     continue;
 
diff --git a/methods/Mangos/SpellMethods.h b/methods/Mangos/SpellMethods.h
index 5ebbb36..37f8edd 100644
--- a/methods/Mangos/SpellMethods.h
+++ b/methods/Mangos/SpellMethods.h
@@ -54,7 +54,7 @@ namespace LuaSpell
      */
     int GetEntry(Eluna* E, Spell* spell)
     {
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
         E->Push(spell->m_spellInfo->ID);
 #else
         E->Push(spell->m_spellInfo->Id);
diff --git a/methods/Mangos/UnitMethods.h b/methods/Mangos/UnitMethods.h
index 0730088..15be2c4 100644
--- a/methods/Mangos/UnitMethods.h
+++ b/methods/Mangos/UnitMethods.h
@@ -948,7 +948,7 @@ namespace LuaUnit
         if (!entry)
             return 1;
 
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
         E->Push(entry->Name_lang[locale]);
 #else
         E->Push(entry->name[locale]);
@@ -987,7 +987,7 @@ namespace LuaUnit
         if (!entry)
             return 1;
 
-#if ELUNA_EXPANSION == EXP_CLASSIC
+#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC)
         E->Push(entry->Name_lang[locale]);
 #else
         E->Push(entry->name[locale]);