diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index 7e1cadc..642ec97 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -71,19 +71,19 @@ ai级别
 8: 跑动射击
 */
 
-AndroidNewAI::AndroidNewAI()
+AndroidAI::AndroidAI()
 {
     old_ai_data_ = new OldAiData();
     node_ = new AINode();
 }
 
-AndroidNewAI::~AndroidNewAI()
+AndroidAI::~AndroidAI()
 {
     A8_SAFE_DELETE(old_ai_data_);
     A8_SAFE_DELETE(node_);
 }
 
-void AndroidNewAI::Update(int delta_time)
+void AndroidAI::Update(int delta_time)
 {
     old_ai_data_->state_elapsed_time += delta_time;
     Human* hum = (Human*)owner;
@@ -103,7 +103,7 @@ void AndroidNewAI::Update(int delta_time)
     UpdateNewAI();
 }
 
-float AndroidNewAI::GetAttackRate()
+float AndroidAI::GetAttackRate()
 {
     if (!ai_meta) {
         return 1;
@@ -112,7 +112,7 @@ float AndroidNewAI::GetAttackRate()
     }
 }
 
-void AndroidNewAI::DefaultAi()
+void AndroidAI::DefaultAi()
 {
     switch (old_ai_data_->state) {
     case AS_thinking:
@@ -159,7 +159,7 @@ void AndroidNewAI::DefaultAi()
     }
 }
 
-void AndroidNewAI::ChangeToStateOldAI(AndroidState_e to_state)
+void AndroidAI::ChangeToStateOldAI(AndroidState_e to_state)
 {
     old_ai_data_->state = to_state;
     old_ai_data_->state_elapsed_time = 0;
@@ -179,7 +179,7 @@ void AndroidNewAI::ChangeToStateOldAI(AndroidState_e to_state)
     }
 }
 
-void AndroidNewAI::DoMoveOldAI()
+void AndroidAI::DoMoveOldAI()
 {
     Human* hum = (Human*)owner;
     if (hum->room->IsWaitingStart()) {
@@ -208,7 +208,7 @@ void AndroidNewAI::DoMoveOldAI()
     }
 }
 
-void AndroidNewAI::DoAttackOldAI()
+void AndroidAI::DoAttackOldAI()
 {
     Human* hum = (Human*)owner;
     if (hum->room->IsWaitingStart()) {
@@ -238,7 +238,7 @@ void AndroidNewAI::DoAttackOldAI()
     }
 }
 
-void AndroidNewAI::UpdateNewAI()
+void AndroidAI::UpdateNewAI()
 {
     Human* hum = (Human*)owner;
     if (a8::HasBitFlag(hum->status, HS_Disable)) {
@@ -292,7 +292,7 @@ void AndroidNewAI::UpdateNewAI()
     }
 }
 
-void AndroidNewAI::UpdateIdle()
+void AndroidAI::UpdateIdle()
 {
     Human* hum = (Human*)owner;
     if (hum->room->GetFrameNo() > node_->frameno + node_->param1) {
@@ -300,7 +300,7 @@ void AndroidNewAI::UpdateIdle()
     }
 }
 
-void AndroidNewAI::UpdateThinking()
+void AndroidAI::UpdateThinking()
 {
     Human* hum = (Human*)owner;
     if (hum->room->GetGasData().gas_mode == GasInactive ||
@@ -332,7 +332,7 @@ void AndroidNewAI::UpdateThinking()
     }
 }
 
-void AndroidNewAI::UpdateAttack()
+void AndroidAI::UpdateAttack()
 {
     Human* myself = (Human*)owner;
     if (!node_->target.Get() || node_->target.Get()->dead) {
@@ -399,7 +399,7 @@ void AndroidNewAI::UpdateAttack()
     }
 }
 
-void AndroidNewAI::UpdateRandomWalk()
+void AndroidAI::UpdateRandomWalk()
 {
     Human* hum = (Human*)owner;
     if (hum->room->GetFrameNo() > node_->frameno + node_->param1) {
@@ -407,7 +407,7 @@ void AndroidNewAI::UpdateRandomWalk()
     }
 }
 
-void AndroidNewAI::UpdatePursuit()
+void AndroidAI::UpdatePursuit()
 {
     Human* myself = (Human*)owner;
     if (node_->target.Get()) {
@@ -428,7 +428,7 @@ void AndroidNewAI::UpdatePursuit()
     }
 }
 
-void AndroidNewAI::DoMoveNewAI()
+void AndroidAI::DoMoveNewAI()
 {
     Human* hum = (Human*)owner;
     if (hum->HasBuffEffect(kBET_Vertigo)) {
@@ -455,7 +455,7 @@ void AndroidNewAI::DoMoveNewAI()
     }
 }
 
-void AndroidNewAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
+void AndroidAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
 {
     Human* hum = (Human*)owner;
     switch (to_state) {
@@ -533,7 +533,7 @@ void AndroidNewAI::ChangeToStateNewAI(AndroidStateEx_e to_state)
     node_->exec_frame_num = 0;
 }
 
-Creature* AndroidNewAI::GetTarget()
+Creature* AndroidAI::GetTarget()
 {
     if (GetAiLevel() <= 1) {
         return nullptr;
@@ -568,7 +568,7 @@ Creature* AndroidNewAI::GetTarget()
     return target;
 }
 
-float AndroidNewAI::GetAttackRange()
+float AndroidAI::GetAttackRange()
 {
     float attack_range = 0;
     Human* myself = (Human*)owner;
@@ -579,7 +579,7 @@ float AndroidNewAI::GetAttackRange()
     return attack_range;
 }
 
-void AndroidNewAI::DoShotNewAI()
+void AndroidAI::DoShotNewAI()
 {
     Human* myself = (Human*)owner;
     if (!node_->target.Get()) {
@@ -619,7 +619,7 @@ void AndroidNewAI::DoShotNewAI()
     }
 }
 
-int AndroidNewAI::GetAttackTimes()
+int AndroidAI::GetAttackTimes()
 {
     Human* myself = (Human*)owner;
     if (myself->GetCurrWeapon()) {
diff --git a/server/gameserver/android.ai.h b/server/gameserver/android.ai.h
index b96f25b..cd3c9c0 100644
--- a/server/gameserver/android.ai.h
+++ b/server/gameserver/android.ai.h
@@ -8,12 +8,12 @@ enum AndroidState_e : int;
 struct OldAiData;
 struct AINode;
 class Human;
-class AndroidNewAI : public AIComponent
+class AndroidAI : public AIComponent
 {
 public:
 
-    AndroidNewAI();
-    virtual ~AndroidNewAI() override;
+    AndroidAI();
+    virtual ~AndroidAI() override;
     virtual void Update(int delta_time) override;
     float GetAttackRate();
 
diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
index 1a04b8d..40886dd 100644
--- a/server/gameserver/android.cc
+++ b/server/gameserver/android.cc
@@ -32,7 +32,7 @@ void Android::Initialize()
         ai->SetAiLevel(8);
         ai->SetAiMode(kHumanAiMode);
     } else {
-        ai = new AndroidNewAI;
+        ai = new AndroidAI;
         ai->owner = this;
     }
     Human::Initialize();