diff --git a/server/gameserver/attrhelper.cc b/server/gameserver/attrhelper.cc
index fd9aa291..431109db 100644
--- a/server/gameserver/attrhelper.cc
+++ b/server/gameserver/attrhelper.cc
@@ -2,7 +2,7 @@
 
 #include "attrhelper.h"
 
-float* AttrHelper::GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id)
+float* AttrHelper::GetAttrAbsPtr(std::array<float, kNHAT_End>& attr, int attr_id)
 {
     if (!IsValidHumanAttr(attr_id)) {
         return nullptr;
@@ -11,7 +11,7 @@ float* AttrHelper::GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id)
 }
 
 
-float* AttrHelper::GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id)
+float* AttrHelper::GetAttrRatePtr(std::array<float, kNHAT_End>& attr, int attr_id)
 {
     if (!IsValidHumanAttr(attr_id)) {
         return nullptr;
@@ -20,8 +20,8 @@ float* AttrHelper::GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id
 }
 
 bool AttrHelper::ParseAttr(std::shared_ptr<a8::XObject> xobj,
-                           std::array<float, kHAT_End>& attr_abs,
-                           std::array<float, kHAT_End>& attr_rate)
+                           std::array<float, kNHAT_End>& attr_abs,
+                           std::array<float, kNHAT_End>& attr_rate)
 {
     if (xobj->IsArray()) {
         for (int i = 0; i < xobj->Size(); ++i) {
diff --git a/server/gameserver/attrhelper.h b/server/gameserver/attrhelper.h
index 9cf25406..462b5b6b 100644
--- a/server/gameserver/attrhelper.h
+++ b/server/gameserver/attrhelper.h
@@ -6,11 +6,11 @@ class AttrHelper
 {
  public:
 
-    static float* GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id);
-    static float* GetAttrRatePtr(std::array<float, kHAT_End>& attr, int attr_id);
+    static float* GetAttrAbsPtr(std::array<float, kNHAT_End>& attr, int attr_id);
+    static float* GetAttrRatePtr(std::array<float, kNHAT_End>& attr, int attr_id);
 
     static bool ParseAttr(std::shared_ptr<a8::XObject> xobj,
-                          std::array<float, kHAT_End>& attr_abs,
-                          std::array<float, kHAT_End>& attr_rate);
+                          std::array<float, kNHAT_End>& attr_abs,
+                          std::array<float, kNHAT_End>& attr_rate);
 
 };
diff --git a/server/gameserver/global.cc b/server/gameserver/global.cc
index a782f717..d57ecfff 100644
--- a/server/gameserver/global.cc
+++ b/server/gameserver/global.cc
@@ -15,7 +15,7 @@ bool IsValidBuffEffect(int buff_effect)
 
 bool IsValidHumanAttr(int attr_type)
 {
-    return attr_type > kHAT_Begin && attr_type < kHAT_End;
+    return attr_type > kNHAT_Begin && attr_type < kNHAT_End;
 }
 
 bool IsValidHumanVirtualAttr(int attr_type)
diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index cc92181f..1f840fba 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -317,20 +317,20 @@ private:
 
     void DtoInit(Creature* c)
     {
-        std::array<float, kHAT_End> base_attr_abs = {0};
-        std::array<float, kHAT_End> base_attr_rate = {0};
+        std::array<float, kNHAT_End> base_attr_abs = {0};
+        std::array<float, kNHAT_End> base_attr_rate = {0};
 
-        std::array<float, kHAT_End> pro_attr_abs = {0};
-        std::array<float, kHAT_End> pro_attr_rate = {0};
+        std::array<float, kNHAT_End> pro_attr_abs = {0};
+        std::array<float, kNHAT_End> pro_attr_rate = {0};
 
-        std::array<float, kHAT_End> skill_attr_abs = {0};
-        std::array<float, kHAT_End> skill_attr_rate = {0};
+        std::array<float, kNHAT_End> skill_attr_abs = {0};
+        std::array<float, kNHAT_End> skill_attr_rate = {0};
 
-        std::array<float, kHAT_End> chip_attr_abs = {0};
-        std::array<float, kHAT_End> chip_attr_rate = {0};
+        std::array<float, kNHAT_End> chip_attr_abs = {0};
+        std::array<float, kNHAT_End> chip_attr_rate = {0};
 
-        std::array<float, kHAT_End> core_attr_abs = {0};
-        std::array<float, kHAT_End> core_attr_rate = {0};
+        std::array<float, kNHAT_End> core_attr_abs = {0};
+        std::array<float, kNHAT_End> core_attr_rate = {0};
 
         {
             std::shared_ptr<a8::XObject> attr_base_xobj = hero_dto->At("attr_base");
@@ -369,9 +369,9 @@ private:
             }
         }
 
-        std::array<float, kHAT_End> finaly_attr_abs = base_attr_abs;
-        std::array<float, kHAT_End> finaly_attr_rate = base_attr_rate;
-        for (int i = 0; i < kHAT_End; ++i) {
+        std::array<float, kNHAT_End> finaly_attr_abs = base_attr_abs;
+        std::array<float, kNHAT_End> finaly_attr_rate = base_attr_rate;
+        for (int i = 0; i < kNHAT_End; ++i) {
             if (pro_attr_abs[i] > 0.000f) {
                 finaly_attr_abs[i] = pro_attr_abs[i];
             }
@@ -493,17 +493,17 @@ private:
 
     void DtoInit(Creature* c)
     {
-        std::array<float, kHAT_End> base_attr_abs = {0};
-        std::array<float, kHAT_End> base_attr_rate = {0};
+        std::array<float, kNHAT_End> base_attr_abs = {0};
+        std::array<float, kNHAT_End> base_attr_rate = {0};
 
-        std::array<float, kHAT_End> pro_attr_abs = {0};
-        std::array<float, kHAT_End> pro_attr_rate = {0};
+        std::array<float, kNHAT_End> pro_attr_abs = {0};
+        std::array<float, kNHAT_End> pro_attr_rate = {0};
 
-        std::array<float, kHAT_End> chip_attr_abs = {0};
-        std::array<float, kHAT_End> chip_attr_rate = {0};
+        std::array<float, kNHAT_End> chip_attr_abs = {0};
+        std::array<float, kNHAT_End> chip_attr_rate = {0};
 
-        std::array<float, kHAT_End> core_attr_abs = {0};
-        std::array<float, kHAT_End> core_attr_rate = {0};
+        std::array<float, kNHAT_End> core_attr_abs = {0};
+        std::array<float, kNHAT_End> core_attr_rate = {0};
 
         {
             std::shared_ptr<a8::XObject> attr_base_xobj = weapon_dto->At("attr_base");
@@ -536,9 +536,9 @@ private:
             }
         }
 
-        std::array<float, kHAT_End> finaly_attr_abs = base_attr_abs;
-        std::array<float, kHAT_End> finaly_attr_rate = base_attr_rate;
-        for (int i = 0; i < kHAT_End; ++i) {
+        std::array<float, kNHAT_End> finaly_attr_abs = base_attr_abs;
+        std::array<float, kNHAT_End> finaly_attr_rate = base_attr_rate;
+        for (int i = 0; i < kNHAT_End; ++i) {
             if (pro_attr_abs[i] > 0.000f) {
                 finaly_attr_abs[i] = pro_attr_abs[i];
             }