diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp
index 92940d891..7ca26571e 100644
--- a/source/enemy/npc.cpp
+++ b/source/enemy/npc.cpp
@@ -60,12 +60,12 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
 		128,
 	},
 
-	{	// NPC_FALLING_ACORN
-		NPC_INIT_FALLING_ACORN,
-		NPC_SENSOR_FALLING_ACORN_USER_CLOSE,
+	{	// NPC_FALLING_ITEM
+		NPC_INIT_FALLING_ITEM,
+		NPC_SENSOR_FALLING_ITEM_USER_CLOSE,
 		NPC_MOVEMENT_STATIC,
 		NPC_MOVEMENT_MODIFIER_NONE,
-		NPC_CLOSE_FALLING_ACORN_FALL,
+		NPC_CLOSE_FALLING_ITEM_FALL,
 		NPC_TIMER_NONE,
 		false,
 		3,
@@ -516,7 +516,7 @@ void CNpc::init()
 			break;
 
 		case NPC_INIT_SKULL_STOMPER:
-		case NPC_INIT_FALLING_ACORN:
+		case NPC_INIT_FALLING_ITEM:
 		{
 			m_heading = m_fireHeading = 1024;
 			
@@ -866,7 +866,7 @@ bool CNpc::processSensor()
 
 					case NPC_SENSOR_ANEMONE_USER_CLOSE:
 					case NPC_SENSOR_EYEBALL_USER_CLOSE:
-					case NPC_SENSOR_FALLING_ACORN_USER_CLOSE:
+					case NPC_SENSOR_FALLING_ITEM_USER_CLOSE:
 					{
 						if ( xDistSqr + yDistSqr < 40000 )
 						{
@@ -1197,8 +1197,8 @@ void CNpc::processClose(int _frames)
 
 			break;
 
-		case NPC_CLOSE_FALLING_ACORN_FALL:
-			processCloseFallingAcornFall( _frames );
+		case NPC_CLOSE_FALLING_ITEM_FALL:
+			processCloseFallingItemFall( _frames );
 
 			break;
 
diff --git a/source/enemy/npc.h b/source/enemy/npc.h
index 21a90efbd..9347b3e58 100644
--- a/source/enemy/npc.h
+++ b/source/enemy/npc.h
@@ -30,7 +30,7 @@ public:
 	enum NPC_UNIT_TYPE
 	{
 		NPC_SANDY_CHEEKS = 0,
-		NPC_FALLING_ACORN = 1,
+		NPC_FALLING_ITEM = 1,
 		NPC_FISH_HOOK,
 		NPC_SMALL_JELLYFISH_1,
 		NPC_SMALL_JELLYFISH_2,
@@ -87,7 +87,7 @@ protected:
 		NPC_INIT_SUB_SHARK,
 		NPC_INIT_FLYING_DUTCHMAN,
 		NPC_INIT_IRON_DOGFISH,
-		NPC_INIT_FALLING_ACORN,
+		NPC_INIT_FALLING_ITEM,
 		NPC_INIT_FISH_HOOK,
 	};
 
@@ -115,7 +115,7 @@ protected:
 		NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
 		NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE,
 		NPC_SENSOR_IRON_DOGFISH_USER_CLOSE,
-		NPC_SENSOR_FALLING_ACORN_USER_CLOSE,
+		NPC_SENSOR_FALLING_ITEM_USER_CLOSE,
 		NPC_SENSOR_FISH_HOOK_USER_CLOSE,
 	};
 
@@ -137,7 +137,7 @@ protected:
 		NPC_CLOSE_SUB_SHARK_ATTACK,
 		NPC_CLOSE_FLYING_DUTCHMAN_ATTACK,
 		NPC_CLOSE_IRON_DOGFISH_ATTACK,
-		NPC_CLOSE_FALLING_ACORN_FALL,
+		NPC_CLOSE_FALLING_ITEM_FALL,
 		NPC_CLOSE_FISH_HOOK_RISE,
 	};
 
@@ -297,7 +297,7 @@ protected:
 
 	// hazard functions
 
-	void				processCloseFallingAcornFall( int _frames );
+	void				processCloseFallingItemFall( int _frames );
 	void				processCloseFishHookRise( int _frames );
 
 	// data