diff --git a/BattleGroundMethods.h b/BattleGroundMethods.h
index f70184d..80eedf3 100644
--- a/BattleGroundMethods.h
+++ b/BattleGroundMethods.h
@@ -26,7 +26,7 @@ namespace LuaBattleGround
     /**
      * Returns the amount of alive players in the [BattleGround] by the team ID.
      *
-     * @param uint32 team : team ID
+     * @param [Team] team : team ID
      * @return uint32 count
      */
     int GetAlivePlayersCountByTeam(Eluna* /*E*/, lua_State* L, BattleGround* bg)
@@ -91,7 +91,7 @@ namespace LuaBattleGround
     /**
      * Returns the amount of free slots for the selected team in the specific [BattleGround].
      *
-     * @param uint32 team : team ID
+     * @param [Team] team : team ID
      * @return uint32 freeSlots
      */
     int GetFreeSlotsForTeam(Eluna* /*E*/, lua_State* L, BattleGround* bg)
diff --git a/GlobalMethods.h b/GlobalMethods.h
index 02da109..190435a 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -1862,7 +1862,7 @@ namespace LuaGlobalFunctions
     /**
      * Creates a [WorldPacket].
      *
-     * @param uint32 opcode : the opcode of the packet
+     * @param [Opcodes] opcode : the opcode of the packet
      * @param uint32 size : the size of the packet
      * @return [WorldPacket] packet
      */
@@ -1982,7 +1982,7 @@ namespace LuaGlobalFunctions
      *         BAN_IP
      *     };
      *
-     * @param int32 banMode : method of ban, refer to BanMode above
+     * @param [BanMode] banMode : method of ban, refer to BanMode above
      * @param string nameOrIP : name of the [Player] or IP of the [Player]
      * @param uint32 duration : duration (in seconds) of the ban
      * @param string reason = "" : ban reason, this is optional
@@ -2053,7 +2053,7 @@ namespace LuaGlobalFunctions
      * @param string text : contents of the mail
      * @param uint32 receiverGUIDLow : low GUID of the receiver
      * @param uint32 senderGUIDLow = 0 : low GUID of the sender
-     * @param uint32 stationary = MAIL_STATIONERY_DEFAULT : type of mail that is being sent as, refer to MailStationery above
+     * @param [MailStationery] stationary = MAIL_STATIONERY_DEFAULT : type of mail that is being sent as, refer to MailStationery above
      * @param uint32 delay = 0 : mail send delay in milliseconds
      * @param uint32 money = 0 : money to send
      * @param uint32 cod = 0 : cod money amount
diff --git a/ItemMethods.h b/ItemMethods.h
index 49f5faf..d6e6602 100644
--- a/ItemMethods.h
+++ b/ItemMethods.h
@@ -387,7 +387,7 @@ namespace LuaItem
     /**
      * Returns the [Item]s enchantment ID by enchant slot specified
      *
-     * @param uint32 enchantSlot : the enchant slot specified
+     * @param [EnchantmentSlot] enchantSlot : the enchant slot specified
      * @return uint32 enchantId : the id of the enchant slot specified
      */
     int GetEnchantmentId(Eluna* /*E*/, lua_State* L, Item* item)
diff --git a/PlayerMethods.h b/PlayerMethods.h
index e9d728f..fcb8745 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -1340,9 +1340,9 @@ namespace LuaPlayer
     }
 
     /**
-     * Returns the [Player]s current team ID
+     * Returns the [Player]s [TeamId]
      *
-     * @return [PvpTeamIndex] teamId
+     * @return [TeamId] teamId
      */
     int GetTeam(Eluna* /*E*/, lua_State* L, Player* player)
     {
@@ -1773,7 +1773,7 @@ namespace LuaPlayer
      * - GENDER_MALE    = 0
      * - GENDER_FEMALE  = 1
      *
-     * @param uint32 gender
+     * @param [Gender] gender
      */
     int SetGender(Eluna* /*E*/, lua_State* L, Player* player)
     {
@@ -3282,7 +3282,7 @@ namespace LuaPlayer
     }
 
     /**
-     * Learn the [Player] the [Talent] specified by talent_id and talentRank
+     * Learn the [Player] the talent specified by talent_id and talentRank
      *
      * @param uint32 talent_id
      * @param uint32 talentRank
diff --git a/QuestMethods.h b/QuestMethods.h
index 798f3c5..fded3a7 100644
--- a/QuestMethods.h
+++ b/QuestMethods.h
@@ -43,7 +43,7 @@ namespace LuaQuest
      * };
      * </pre>
      *
-     * @param uint32 flag : all available flags can be seen above
+     * @param [QuestFlags] flag : all available flags can be seen above
      * @return bool hasFlag
      */
     int HasFlag(Eluna* /*E*/, lua_State* L, Quest* quest)
@@ -150,7 +150,7 @@ namespace LuaQuest
     /**
      * Returns the [Quest]'s flags.
      *
-     * @return uint32 flags
+     * @return [QuestFlags] flags
      */
     int GetFlags(Eluna* /*E*/, lua_State* L, Quest* quest)
     {
diff --git a/UnitMethods.h b/UnitMethods.h
index 116cd68..5f59326 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -540,7 +540,7 @@ namespace LuaUnit
     /**
      * Returns true if the [Unit] has the given unit state.
      *
-     * @param uint32 state : an unit state
+     * @param [UnitState] state : an unit state
      * @return bool hasState
      */
     int HasUnitState(Eluna* /*E*/, lua_State* L, Unit* unit)
@@ -996,7 +996,7 @@ namespace LuaUnit
     /**
      * Returns the [Unit]'s race ID.
      *
-     * @return uint8 race
+     * @return [Races] race
      */
     int GetRace(Eluna* /*E*/, lua_State* L, Unit* unit)
     {
@@ -1007,7 +1007,7 @@ namespace LuaUnit
     /**
      * Returns the [Unit]'s class ID.
      *
-     * @return uint8 class
+     * @return [Classes] class
      */
     int GetClass(Eluna* /*E*/, lua_State* L, Unit* unit)
     {
@@ -2282,7 +2282,7 @@ namespace LuaUnit
     /**
      * Adds the given unit state for the [Unit].
      *
-     * @param uint32 state
+     * @param [UnitState] state
      */
     int AddUnitState(Eluna* /*E*/, lua_State* L, Unit* unit)
     {
@@ -2299,7 +2299,7 @@ namespace LuaUnit
     /**
      * Removes the given unit state from the [Unit].
      *
-     * @param uint32 state
+     * @param [UnitState] state
      */
     int ClearUnitState(Eluna* /*E*/, lua_State* L, Unit* unit)
     {
diff --git a/WorldObjectMethods.h b/WorldObjectMethods.h
index 68b2e52..229881a 100644
--- a/WorldObjectMethods.h
+++ b/WorldObjectMethods.h
@@ -654,7 +654,7 @@ namespace LuaWorldObject
      * @param float y
      * @param float z
      * @param float o
-     * @param [TempSummonType] spawnType = 8 : defines how and when the creature despawns
+     * @param [TempSummonType] spawnType = MANUAL_DESPAWN : defines how and when the creature despawns
      * @param uint32 despawnTimer = 0 : despawn time in milliseconds
      * @return [Creature] spawnedCreature
      */
diff --git a/WorldPacketMethods.h b/WorldPacketMethods.h
index 5a182e6..c2293c1 100644
--- a/WorldPacketMethods.h
+++ b/WorldPacketMethods.h
@@ -43,7 +43,7 @@ namespace LuaPacket
     /**
      * Sets the opcode of the [WorldPacket] to the specified opcode.
      *
-     * @param uint32 opcode : see Opcodes.h for all known opcodes
+     * @param [Opcodes] opcode : see Opcodes.h for all known opcodes
      */
     int SetOpcode(Eluna* /*E*/, lua_State* L, WorldPacket* packet)
     {