diff --git a/common/ruletypes.h b/common/ruletypes.h
index 5aeaa3021..c6e99e5f4 100644
--- a/common/ruletypes.h
+++ b/common/ruletypes.h
@@ -567,7 +567,6 @@ RULE_INT(Range, MobPositionUpdates, 600, "")
 RULE_INT(Range, ClientPositionUpdates, 300, "")
 RULE_INT(Range, ClientForceSpawnUpdateRange, 1000, "")
 RULE_INT(Range, CriticalDamage, 80, "")
-RULE_INT(Range, ClientNPCScan, 300, "")
 RULE_INT(Range, MobCloseScanDistance, 600, "")
 RULE_CATEGORY_END()
 
diff --git a/zone/client.cpp b/zone/client.cpp
index a99b2818a..f77dc1fd4 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -123,49 +123,49 @@ Client::Client(EQStreamInterface* ieqs)
 	0,
 	0
 	),
-	hpupdate_timer(2000),
-	camp_timer(29000),
-	process_timer(100),
-	consume_food_timer(CONSUMPTION_TIMER),
-	zoneinpacket_timer(1000),
-	linkdead_timer(RuleI(Zone,ClientLinkdeadMS)),
-	dead_timer(2000),
-	global_channel_timer(1000),
-	shield_timer(500),
-	fishing_timer(8000),
-	endupkeep_timer(1000),
-	forget_timer(0),
-	autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
-	client_scan_npc_aggro_timer(RuleI(Aggro, ClientAggroCheckInterval) * 1000),
-	client_zone_wide_full_position_update_timer(5 * 60 * 1000),
-	tribute_timer(Tribute_duration),
-	proximity_timer(ClientProximity_interval),
-	TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
-	charm_update_timer(6000),
-	rest_timer(1),
-	charm_class_attacks_timer(3000),
-	charm_cast_timer(3500),
-	qglobal_purge_timer(30000),
-	TrackingTimer(2000),
-	RespawnFromHoverTimer(0),
-	merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
-	ItemTickTimer(10000),
-	ItemQuestTimer(500),
-	anon_toggle_timer(250),
-	afk_toggle_timer(250),
-	helm_toggle_timer(250),
-	aggro_meter_timer(AGGRO_METER_UPDATE_MS),
-	m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
+  hpupdate_timer(2000),
+  camp_timer(29000),
+  process_timer(100),
+  consume_food_timer(CONSUMPTION_TIMER),
+  zoneinpacket_timer(1000),
+  linkdead_timer(RuleI(Zone,ClientLinkdeadMS)),
+  dead_timer(2000),
+  global_channel_timer(1000),
+  shield_timer(500),
+  fishing_timer(8000),
+  endupkeep_timer(1000),
+  forget_timer(0),
+  autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
+  client_scan_npc_aggro_timer(RuleI(Aggro, ClientAggroCheckInterval) * 1000),
+  client_zone_wide_full_position_update_timer(5 * 60 * 1000),
+  tribute_timer(Tribute_duration),
+  proximity_timer(ClientProximity_interval),
+  TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
+  charm_update_timer(6000),
+  rest_timer(1),
+  charm_class_attacks_timer(3000),
+  charm_cast_timer(3500),
+  qglobal_purge_timer(30000),
+  TrackingTimer(2000),
+  RespawnFromHoverTimer(0),
+  merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
+  ItemTickTimer(10000),
+  ItemQuestTimer(500),
+  anon_toggle_timer(250),
+  afk_toggle_timer(250),
+  helm_toggle_timer(250),
+  aggro_meter_timer(AGGRO_METER_UPDATE_MS),
+  m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
 	m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f),
-	m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),
-	m_AutoAttackTargetLocation(0.0f, 0.0f, 0.0f),
-	last_region_type(RegionTypeUnsupported),
-	m_dirtyautohaters(false),
-	npc_close_scan_timer(6000),
-	hp_self_update_throttle_timer(300),
-	hp_other_update_throttle_timer(500),
-	position_update_timer(10000),
-	tmSitting(0)
+  m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),
+  m_AutoAttackTargetLocation(0.0f, 0.0f, 0.0f),
+  last_region_type(RegionTypeUnsupported),
+  m_dirtyautohaters(false),
+  mob_close_scan_timer(6000),
+  hp_self_update_throttle_timer(300),
+  hp_other_update_throttle_timer(500),
+  position_update_timer(10000),
+  tmSitting(0)
 {
 
 	for (int client_filter = 0; client_filter < _FilterCount; client_filter++)
diff --git a/zone/client.h b/zone/client.h
index 8876e4645..4ff431520 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -1523,7 +1523,7 @@ private:
 	Timer afk_toggle_timer;
 	Timer helm_toggle_timer;
 	Timer aggro_meter_timer;
-	Timer npc_close_scan_timer;
+	Timer mob_close_scan_timer;
 	Timer hp_self_update_throttle_timer; /* This is to prevent excessive packet sending under trains/fast combat */
 	Timer hp_other_update_throttle_timer; /* This is to keep clients from DOSing the server with macros that change client targets constantly */
 	Timer position_update_timer; /* Timer used when client hasn't updated within a 10 second window */
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index 9678d31cd..14b2036cf 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -253,13 +253,12 @@ bool Client::Process() {
 
 		/**
 		 * Scan close range mobs
-		 *
 		 * Used in aggro checks
 		 */
-		if (npc_close_scan_timer.Check()) {
+		if (mob_close_scan_timer.Check()) {
 			close_mobs.clear();
 
-			float scan_range = (RuleI(Range, ClientNPCScan) * RuleI(Range, ClientNPCScan));
+			float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);
 			auto  &mob_list  = entity_list.GetMobList();
 
 			for (auto itr : mob_list) {