From fd90be879c701774857e6b04149edc2a1ccf9eac Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Mon, 13 Jan 2025 14:29:09 -0800
Subject: [PATCH] Rename a bunch of old names.

---
 src/botlib/{NSBot.h => Bot.h}                 |  0
 src/botlib/{NSBot.qc => Bot.qc}               |  0
 ...activeSurface.qc => InteractiveSurface.qc} |  0
 src/client/{NSRadar.h => Radar.h}             |  0
 src/client/{NSRadar.qc => Radar.qc}           |  0
 src/client/{NSView.h => View.h}               |  0
 src/client/{NSView.qc => View.qc}             |  0
 src/client/defs.h                             |  4 +-
 src/client/include.src                        |  8 +--
 src/client/{view.qc => viewmodel.qc}          |  0
 src/server/{NSGameRules.h => GameRules.h}     |  0
 src/server/{NSGameRules.qc => GameRules.qc}   |  0
 src/server/{NSOutput.h => Output.h}           |  0
 src/server/{NSOutput.qc => Output.qc}         |  0
 src/server/{ai_schedule.h => Schedule.h}      |  0
 src/server/{ai_schedule.qc => Schedule.qc}    |  0
 src/server/defs.h                             |  6 +-
 src/server/include.src                        |  6 +-
 src/shared/{NSNavAI.h => Actor.h}             |  0
 src/shared/{NSNavAI.qc => Actor.qc}           |  0
 src/shared/{NSAttack.h => Attack.h}           |  0
 src/shared/{NSAttack.qc => Attack.qc}         |  0
 .../{NSBrushTrigger.h => BrushTrigger.h}      |  0
 .../{NSBrushTrigger.qc => BrushTrigger.qc}    |  0
 src/shared/{NSCharger.qc => Charger.qc}       |  0
 src/shared/{NSClient.h => Client.h}           |  0
 src/shared/{NSClient.qc => Client.qc}         |  0
 src/shared/{NSDebris.h => Debris.h}           |  0
 src/shared/{NSDebris.qc => Debris.qc}         |  0
 src/shared/{NSDecal.h => Decal.h}             |  0
 src/shared/{NSDecal.qc => Decal.qc}           |  0
 src/shared/{NSDict.h => Dict.h}               |  0
 src/shared/{NSDict.qc => Dict.qc}             |  0
 src/shared/{NSEntity.h => Entity.h}           |  0
 src/shared/{NSEntity.qc => Entity.qc}         |  0
 src/shared/{NSIO.h => IO.h}                   |  0
 src/shared/{NSIO.qc => IO.qc}                 |  0
 src/shared/{NSItem.h => Item.h}               |  0
 src/shared/{NSItem.qc => Item.qc}             |  0
 src/shared/{NSMonster.h => Monster.h}         |  0
 src/shared/{NSMonster.qc => Monster.qc}       | 16 ++---
 src/shared/{NSMoverEntity.h => Mover.h}       |  0
 src/shared/{NSMoverEntity.qc => Mover.qc}     |  0
 ...hysicsConstraint.h => PhysicsConstraint.h} |  0
 ...sicsConstraint.qc => PhysicsConstraint.qc} |  0
 .../{NSPhysicsEntity.h => PhysicsEntity.h}    |  0
 .../{NSPhysicsEntity.qc => PhysicsEntity.qc}  |  0
 src/shared/{NSClientPlayer.h => Player.h}     |  0
 src/shared/{NSClientPlayer.qc => Player.qc}   |  0
 .../{NSPointTrigger.h => PointTrigger.h}      |  0
 .../{NSPointTrigger.qc => PointTrigger.qc}    |  0
 src/shared/{NSPortal.h => Portal.h}           |  0
 src/shared/{NSPortal.qc => Portal.qc}         |  0
 src/shared/{NSProjectile.h => Projectile.h}   |  0
 src/shared/{NSProjectile.qc => Projectile.qc} |  0
 src/shared/{NSRagdoll.h => Ragdoll.h}         |  0
 src/shared/{NSRagdoll.qc => Ragdoll.qc}       |  0
 ...SRenderableEntity.h => RenderableEntity.h} |  0
 ...enderableEntity.qc => RenderableEntity.qc} |  0
 src/shared/{NSSound.h => Sound.h}             |  0
 src/shared/{NSSound.qc => Sound.qc}           |  0
 src/shared/{NSSoundScape.h => SoundScape.h}   |  0
 src/shared/{NSSoundScape.qc => SoundScape.qc} |  0
 src/shared/{NSSpawnPoint.h => SpawnPoint.h}   |  0
 src/shared/{NSSpawnPoint.qc => SpawnPoint.qc} |  0
 .../{NSClientSpectator.h => Spectator.h}      |  0
 .../{NSClientSpectator.qc => Spectator.qc}    |  0
 src/shared/{NSSpraylogo.h => Spraylogo.h}     |  0
 src/shared/{NSSpraylogo.qc => Spraylogo.qc}   |  0
 .../{NSSquadMonster.h => SquadMonster.h}      |  0
 .../{NSSquadMonster.qc => SquadMonster.qc}    |  0
 ...urfacePropEntity.h => SurfacePropEntity.h} |  0
 ...facePropEntity.qc => SurfacePropEntity.qc} |  0
 src/shared/{NSTalkMonster.h => TalkMonster.h} |  0
 .../{NSTalkMonster.qc => TalkMonster.qc}      |  0
 src/shared/{NSTimer.h => Timer.h}             |  0
 src/shared/{NSTimer.qc => Timer.qc}           |  0
 src/shared/{NSTrigger.h => Trigger.h}         |  0
 src/shared/{NSTrigger.qc => Trigger.qc}       |  0
 src/shared/{NSVehicle.h => Vehicle.h}         |  0
 src/shared/{NSVehicle.qc => Vehicle.qc}       |  0
 src/shared/{NSWeapon.h => Weapon.h}           |  0
 src/shared/{NSWeapon.qc => Weapon.qc}         |  0
 src/shared/defs.h                             | 66 +++++++++---------
 src/shared/include.src                        | 68 +++++++++----------
 85 files changed, 87 insertions(+), 87 deletions(-)
 rename src/botlib/{NSBot.h => Bot.h} (100%)
 rename src/botlib/{NSBot.qc => Bot.qc} (100%)
 rename src/client/{NSInteractiveSurface.qc => InteractiveSurface.qc} (100%)
 rename src/client/{NSRadar.h => Radar.h} (100%)
 rename src/client/{NSRadar.qc => Radar.qc} (100%)
 rename src/client/{NSView.h => View.h} (100%)
 rename src/client/{NSView.qc => View.qc} (100%)
 rename src/client/{view.qc => viewmodel.qc} (100%)
 rename src/server/{NSGameRules.h => GameRules.h} (100%)
 rename src/server/{NSGameRules.qc => GameRules.qc} (100%)
 rename src/server/{NSOutput.h => Output.h} (100%)
 rename src/server/{NSOutput.qc => Output.qc} (100%)
 rename src/server/{ai_schedule.h => Schedule.h} (100%)
 rename src/server/{ai_schedule.qc => Schedule.qc} (100%)
 rename src/shared/{NSNavAI.h => Actor.h} (100%)
 rename src/shared/{NSNavAI.qc => Actor.qc} (100%)
 rename src/shared/{NSAttack.h => Attack.h} (100%)
 rename src/shared/{NSAttack.qc => Attack.qc} (100%)
 rename src/shared/{NSBrushTrigger.h => BrushTrigger.h} (100%)
 rename src/shared/{NSBrushTrigger.qc => BrushTrigger.qc} (100%)
 rename src/shared/{NSCharger.qc => Charger.qc} (100%)
 rename src/shared/{NSClient.h => Client.h} (100%)
 rename src/shared/{NSClient.qc => Client.qc} (100%)
 rename src/shared/{NSDebris.h => Debris.h} (100%)
 rename src/shared/{NSDebris.qc => Debris.qc} (100%)
 rename src/shared/{NSDecal.h => Decal.h} (100%)
 rename src/shared/{NSDecal.qc => Decal.qc} (100%)
 rename src/shared/{NSDict.h => Dict.h} (100%)
 rename src/shared/{NSDict.qc => Dict.qc} (100%)
 rename src/shared/{NSEntity.h => Entity.h} (100%)
 rename src/shared/{NSEntity.qc => Entity.qc} (100%)
 rename src/shared/{NSIO.h => IO.h} (100%)
 rename src/shared/{NSIO.qc => IO.qc} (100%)
 rename src/shared/{NSItem.h => Item.h} (100%)
 rename src/shared/{NSItem.qc => Item.qc} (100%)
 rename src/shared/{NSMonster.h => Monster.h} (100%)
 rename src/shared/{NSMonster.qc => Monster.qc} (99%)
 rename src/shared/{NSMoverEntity.h => Mover.h} (100%)
 rename src/shared/{NSMoverEntity.qc => Mover.qc} (100%)
 rename src/shared/{NSPhysicsConstraint.h => PhysicsConstraint.h} (100%)
 rename src/shared/{NSPhysicsConstraint.qc => PhysicsConstraint.qc} (100%)
 rename src/shared/{NSPhysicsEntity.h => PhysicsEntity.h} (100%)
 rename src/shared/{NSPhysicsEntity.qc => PhysicsEntity.qc} (100%)
 rename src/shared/{NSClientPlayer.h => Player.h} (100%)
 rename src/shared/{NSClientPlayer.qc => Player.qc} (100%)
 rename src/shared/{NSPointTrigger.h => PointTrigger.h} (100%)
 rename src/shared/{NSPointTrigger.qc => PointTrigger.qc} (100%)
 rename src/shared/{NSPortal.h => Portal.h} (100%)
 rename src/shared/{NSPortal.qc => Portal.qc} (100%)
 rename src/shared/{NSProjectile.h => Projectile.h} (100%)
 rename src/shared/{NSProjectile.qc => Projectile.qc} (100%)
 rename src/shared/{NSRagdoll.h => Ragdoll.h} (100%)
 rename src/shared/{NSRagdoll.qc => Ragdoll.qc} (100%)
 rename src/shared/{NSRenderableEntity.h => RenderableEntity.h} (100%)
 rename src/shared/{NSRenderableEntity.qc => RenderableEntity.qc} (100%)
 rename src/shared/{NSSound.h => Sound.h} (100%)
 rename src/shared/{NSSound.qc => Sound.qc} (100%)
 rename src/shared/{NSSoundScape.h => SoundScape.h} (100%)
 rename src/shared/{NSSoundScape.qc => SoundScape.qc} (100%)
 rename src/shared/{NSSpawnPoint.h => SpawnPoint.h} (100%)
 rename src/shared/{NSSpawnPoint.qc => SpawnPoint.qc} (100%)
 rename src/shared/{NSClientSpectator.h => Spectator.h} (100%)
 rename src/shared/{NSClientSpectator.qc => Spectator.qc} (100%)
 rename src/shared/{NSSpraylogo.h => Spraylogo.h} (100%)
 rename src/shared/{NSSpraylogo.qc => Spraylogo.qc} (100%)
 rename src/shared/{NSSquadMonster.h => SquadMonster.h} (100%)
 rename src/shared/{NSSquadMonster.qc => SquadMonster.qc} (100%)
 rename src/shared/{NSSurfacePropEntity.h => SurfacePropEntity.h} (100%)
 rename src/shared/{NSSurfacePropEntity.qc => SurfacePropEntity.qc} (100%)
 rename src/shared/{NSTalkMonster.h => TalkMonster.h} (100%)
 rename src/shared/{NSTalkMonster.qc => TalkMonster.qc} (100%)
 rename src/shared/{NSTimer.h => Timer.h} (100%)
 rename src/shared/{NSTimer.qc => Timer.qc} (100%)
 rename src/shared/{NSTrigger.h => Trigger.h} (100%)
 rename src/shared/{NSTrigger.qc => Trigger.qc} (100%)
 rename src/shared/{NSVehicle.h => Vehicle.h} (100%)
 rename src/shared/{NSVehicle.qc => Vehicle.qc} (100%)
 rename src/shared/{NSWeapon.h => Weapon.h} (100%)
 rename src/shared/{NSWeapon.qc => Weapon.qc} (100%)

diff --git a/src/botlib/NSBot.h b/src/botlib/Bot.h
similarity index 100%
rename from src/botlib/NSBot.h
rename to src/botlib/Bot.h
diff --git a/src/botlib/NSBot.qc b/src/botlib/Bot.qc
similarity index 100%
rename from src/botlib/NSBot.qc
rename to src/botlib/Bot.qc
diff --git a/src/client/NSInteractiveSurface.qc b/src/client/InteractiveSurface.qc
similarity index 100%
rename from src/client/NSInteractiveSurface.qc
rename to src/client/InteractiveSurface.qc
diff --git a/src/client/NSRadar.h b/src/client/Radar.h
similarity index 100%
rename from src/client/NSRadar.h
rename to src/client/Radar.h
diff --git a/src/client/NSRadar.qc b/src/client/Radar.qc
similarity index 100%
rename from src/client/NSRadar.qc
rename to src/client/Radar.qc
diff --git a/src/client/NSView.h b/src/client/View.h
similarity index 100%
rename from src/client/NSView.h
rename to src/client/View.h
diff --git a/src/client/NSView.qc b/src/client/View.qc
similarity index 100%
rename from src/client/NSView.qc
rename to src/client/View.qc
diff --git a/src/client/defs.h b/src/client/defs.h
index 06dc3349..167c2381 100644
--- a/src/client/defs.h
+++ b/src/client/defs.h
@@ -23,8 +23,8 @@
 #include "fade.h"
 #include "cmd.h"
 #include "util.h"
-#include "NSView.h"
-#include "NSRadar.h"
+#include "View.h"
+#include "Radar.h"
 #include "crosshair.h"
 #include "hud.h"
 
diff --git a/src/client/include.src b/src/client/include.src
index a413d0d6..ed02fe2d 100644
--- a/src/client/include.src
+++ b/src/client/include.src
@@ -1,7 +1,7 @@
 #includelist
-NSInteractiveSurface.qc
-NSView.qc
-NSRadar.qc
+InteractiveSurface.qc
+View.qc
+Radar.qc
 hud.qc
 fog.qc
 font.qc
@@ -15,7 +15,7 @@ text.qc
 predict.qc
 entities.qc
 modelevent.qc
-view.qc
+viewmodel.qc
 damage.qc
 chat.qc
 textmenu.qc
diff --git a/src/client/view.qc b/src/client/viewmodel.qc
similarity index 100%
rename from src/client/view.qc
rename to src/client/viewmodel.qc
diff --git a/src/server/NSGameRules.h b/src/server/GameRules.h
similarity index 100%
rename from src/server/NSGameRules.h
rename to src/server/GameRules.h
diff --git a/src/server/NSGameRules.qc b/src/server/GameRules.qc
similarity index 100%
rename from src/server/NSGameRules.qc
rename to src/server/GameRules.qc
diff --git a/src/server/NSOutput.h b/src/server/Output.h
similarity index 100%
rename from src/server/NSOutput.h
rename to src/server/Output.h
diff --git a/src/server/NSOutput.qc b/src/server/Output.qc
similarity index 100%
rename from src/server/NSOutput.qc
rename to src/server/Output.qc
diff --git a/src/server/ai_schedule.h b/src/server/Schedule.h
similarity index 100%
rename from src/server/ai_schedule.h
rename to src/server/Schedule.h
diff --git a/src/server/ai_schedule.qc b/src/server/Schedule.qc
similarity index 100%
rename from src/server/ai_schedule.qc
rename to src/server/Schedule.qc
diff --git a/src/server/defs.h b/src/server/defs.h
index 01ca6d93..a11a64a6 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -17,8 +17,8 @@
 #include "api_func.h"
 #include "../shared/api.h"
 #include "../shared/entityDef.h"
-#include "NSOutput.h"
-#include "NSGameRules.h"
+#include "Output.h"
+#include "GameRules.h"
 #include "skill.h"
 #include "logging.h"
 #include "../nav/defs.h"
@@ -29,7 +29,7 @@
 #include "mapcycle.h"
 #include "maptweaks.h"
 #include "scripts.h"
-#include "ai_schedule.h"
+#include "Schedule.h"
 
 /* helper macros */
 #define EVALUATE_FIELD(fieldname, changedflag) {\
diff --git a/src/server/include.src b/src/server/include.src
index 746e2ebc..ecc5ccf4 100644
--- a/src/server/include.src
+++ b/src/server/include.src
@@ -1,10 +1,10 @@
 #includelist
-NSOutput.qc
+Output.qc
 plugins.qc
 logging.qc
 skill.qc
 spawn.qc
-NSGameRules.qc
+GameRules.qc
 vote.qc
 lament.qc
 mapcycle.qc
@@ -13,7 +13,7 @@ scripts.qc
 cmd_cl.qc
 cmd_sv.qc
 entry.qc
-ai_schedule.qc
+Schedule.qc
 ../nav/includes.src
 api.qc
 #endlist
diff --git a/src/shared/NSNavAI.h b/src/shared/Actor.h
similarity index 100%
rename from src/shared/NSNavAI.h
rename to src/shared/Actor.h
diff --git a/src/shared/NSNavAI.qc b/src/shared/Actor.qc
similarity index 100%
rename from src/shared/NSNavAI.qc
rename to src/shared/Actor.qc
diff --git a/src/shared/NSAttack.h b/src/shared/Attack.h
similarity index 100%
rename from src/shared/NSAttack.h
rename to src/shared/Attack.h
diff --git a/src/shared/NSAttack.qc b/src/shared/Attack.qc
similarity index 100%
rename from src/shared/NSAttack.qc
rename to src/shared/Attack.qc
diff --git a/src/shared/NSBrushTrigger.h b/src/shared/BrushTrigger.h
similarity index 100%
rename from src/shared/NSBrushTrigger.h
rename to src/shared/BrushTrigger.h
diff --git a/src/shared/NSBrushTrigger.qc b/src/shared/BrushTrigger.qc
similarity index 100%
rename from src/shared/NSBrushTrigger.qc
rename to src/shared/BrushTrigger.qc
diff --git a/src/shared/NSCharger.qc b/src/shared/Charger.qc
similarity index 100%
rename from src/shared/NSCharger.qc
rename to src/shared/Charger.qc
diff --git a/src/shared/NSClient.h b/src/shared/Client.h
similarity index 100%
rename from src/shared/NSClient.h
rename to src/shared/Client.h
diff --git a/src/shared/NSClient.qc b/src/shared/Client.qc
similarity index 100%
rename from src/shared/NSClient.qc
rename to src/shared/Client.qc
diff --git a/src/shared/NSDebris.h b/src/shared/Debris.h
similarity index 100%
rename from src/shared/NSDebris.h
rename to src/shared/Debris.h
diff --git a/src/shared/NSDebris.qc b/src/shared/Debris.qc
similarity index 100%
rename from src/shared/NSDebris.qc
rename to src/shared/Debris.qc
diff --git a/src/shared/NSDecal.h b/src/shared/Decal.h
similarity index 100%
rename from src/shared/NSDecal.h
rename to src/shared/Decal.h
diff --git a/src/shared/NSDecal.qc b/src/shared/Decal.qc
similarity index 100%
rename from src/shared/NSDecal.qc
rename to src/shared/Decal.qc
diff --git a/src/shared/NSDict.h b/src/shared/Dict.h
similarity index 100%
rename from src/shared/NSDict.h
rename to src/shared/Dict.h
diff --git a/src/shared/NSDict.qc b/src/shared/Dict.qc
similarity index 100%
rename from src/shared/NSDict.qc
rename to src/shared/Dict.qc
diff --git a/src/shared/NSEntity.h b/src/shared/Entity.h
similarity index 100%
rename from src/shared/NSEntity.h
rename to src/shared/Entity.h
diff --git a/src/shared/NSEntity.qc b/src/shared/Entity.qc
similarity index 100%
rename from src/shared/NSEntity.qc
rename to src/shared/Entity.qc
diff --git a/src/shared/NSIO.h b/src/shared/IO.h
similarity index 100%
rename from src/shared/NSIO.h
rename to src/shared/IO.h
diff --git a/src/shared/NSIO.qc b/src/shared/IO.qc
similarity index 100%
rename from src/shared/NSIO.qc
rename to src/shared/IO.qc
diff --git a/src/shared/NSItem.h b/src/shared/Item.h
similarity index 100%
rename from src/shared/NSItem.h
rename to src/shared/Item.h
diff --git a/src/shared/NSItem.qc b/src/shared/Item.qc
similarity index 100%
rename from src/shared/NSItem.qc
rename to src/shared/Item.qc
diff --git a/src/shared/NSMonster.h b/src/shared/Monster.h
similarity index 100%
rename from src/shared/NSMonster.h
rename to src/shared/Monster.h
diff --git a/src/shared/NSMonster.qc b/src/shared/Monster.qc
similarity index 99%
rename from src/shared/NSMonster.qc
rename to src/shared/Monster.qc
index 4903071c..a37d3a41 100644
--- a/src/shared/NSMonster.qc
+++ b/src/shared/Monster.qc
@@ -565,19 +565,22 @@ ncMonster::AlertNoise(void)
 		return;
 	}
 
-	StartSoundDef(m_sndSight, CHAN_VOICE, true);
+	MessageSchedule("AlertSound");
 }
 
 bool
 ncMonster::IsFriend(int al)
 {
 	/* neutrals are always friendly */
-	if (m_iAlliance == MAL_NEUTRAL)
+	if (m_iAlliance == MAL_NEUTRAL) {
 		return (true);
-	if (m_iAlliance == MAL_ROGUE)
+	}
+
+	if (m_iAlliance == MAL_ROGUE) {
 		return (false);
-	else if (al == m_iAlliance)
+	} else if (al == m_iAlliance) {
 		return (true);
+	}
 
 	return (false);
 }
@@ -2806,7 +2809,7 @@ ncMonster_AlertEnemyAlliance(vector pos, float radius, int alliance)
 		return;
 	}
 
-#if 0
+#if 1
 	if (autocvar_ai_debugAlerts)
 		NSLog("AI alert from %v with radius %f and alliance %i", pos, radius, alliance);
 
@@ -2849,9 +2852,6 @@ ncMonster_AlertEnemyAlliance(vector pos, float radius, int alliance)
 		}
 
 		/* we've heard a noise. investigate the location */
-		f.RouteClear();
-		f.RouteToPosition(pos);
-		f.m_flSequenceSpeed = f.GetWalkSpeed();
 		f.AlertNoise();
 	}
 #endif
diff --git a/src/shared/NSMoverEntity.h b/src/shared/Mover.h
similarity index 100%
rename from src/shared/NSMoverEntity.h
rename to src/shared/Mover.h
diff --git a/src/shared/NSMoverEntity.qc b/src/shared/Mover.qc
similarity index 100%
rename from src/shared/NSMoverEntity.qc
rename to src/shared/Mover.qc
diff --git a/src/shared/NSPhysicsConstraint.h b/src/shared/PhysicsConstraint.h
similarity index 100%
rename from src/shared/NSPhysicsConstraint.h
rename to src/shared/PhysicsConstraint.h
diff --git a/src/shared/NSPhysicsConstraint.qc b/src/shared/PhysicsConstraint.qc
similarity index 100%
rename from src/shared/NSPhysicsConstraint.qc
rename to src/shared/PhysicsConstraint.qc
diff --git a/src/shared/NSPhysicsEntity.h b/src/shared/PhysicsEntity.h
similarity index 100%
rename from src/shared/NSPhysicsEntity.h
rename to src/shared/PhysicsEntity.h
diff --git a/src/shared/NSPhysicsEntity.qc b/src/shared/PhysicsEntity.qc
similarity index 100%
rename from src/shared/NSPhysicsEntity.qc
rename to src/shared/PhysicsEntity.qc
diff --git a/src/shared/NSClientPlayer.h b/src/shared/Player.h
similarity index 100%
rename from src/shared/NSClientPlayer.h
rename to src/shared/Player.h
diff --git a/src/shared/NSClientPlayer.qc b/src/shared/Player.qc
similarity index 100%
rename from src/shared/NSClientPlayer.qc
rename to src/shared/Player.qc
diff --git a/src/shared/NSPointTrigger.h b/src/shared/PointTrigger.h
similarity index 100%
rename from src/shared/NSPointTrigger.h
rename to src/shared/PointTrigger.h
diff --git a/src/shared/NSPointTrigger.qc b/src/shared/PointTrigger.qc
similarity index 100%
rename from src/shared/NSPointTrigger.qc
rename to src/shared/PointTrigger.qc
diff --git a/src/shared/NSPortal.h b/src/shared/Portal.h
similarity index 100%
rename from src/shared/NSPortal.h
rename to src/shared/Portal.h
diff --git a/src/shared/NSPortal.qc b/src/shared/Portal.qc
similarity index 100%
rename from src/shared/NSPortal.qc
rename to src/shared/Portal.qc
diff --git a/src/shared/NSProjectile.h b/src/shared/Projectile.h
similarity index 100%
rename from src/shared/NSProjectile.h
rename to src/shared/Projectile.h
diff --git a/src/shared/NSProjectile.qc b/src/shared/Projectile.qc
similarity index 100%
rename from src/shared/NSProjectile.qc
rename to src/shared/Projectile.qc
diff --git a/src/shared/NSRagdoll.h b/src/shared/Ragdoll.h
similarity index 100%
rename from src/shared/NSRagdoll.h
rename to src/shared/Ragdoll.h
diff --git a/src/shared/NSRagdoll.qc b/src/shared/Ragdoll.qc
similarity index 100%
rename from src/shared/NSRagdoll.qc
rename to src/shared/Ragdoll.qc
diff --git a/src/shared/NSRenderableEntity.h b/src/shared/RenderableEntity.h
similarity index 100%
rename from src/shared/NSRenderableEntity.h
rename to src/shared/RenderableEntity.h
diff --git a/src/shared/NSRenderableEntity.qc b/src/shared/RenderableEntity.qc
similarity index 100%
rename from src/shared/NSRenderableEntity.qc
rename to src/shared/RenderableEntity.qc
diff --git a/src/shared/NSSound.h b/src/shared/Sound.h
similarity index 100%
rename from src/shared/NSSound.h
rename to src/shared/Sound.h
diff --git a/src/shared/NSSound.qc b/src/shared/Sound.qc
similarity index 100%
rename from src/shared/NSSound.qc
rename to src/shared/Sound.qc
diff --git a/src/shared/NSSoundScape.h b/src/shared/SoundScape.h
similarity index 100%
rename from src/shared/NSSoundScape.h
rename to src/shared/SoundScape.h
diff --git a/src/shared/NSSoundScape.qc b/src/shared/SoundScape.qc
similarity index 100%
rename from src/shared/NSSoundScape.qc
rename to src/shared/SoundScape.qc
diff --git a/src/shared/NSSpawnPoint.h b/src/shared/SpawnPoint.h
similarity index 100%
rename from src/shared/NSSpawnPoint.h
rename to src/shared/SpawnPoint.h
diff --git a/src/shared/NSSpawnPoint.qc b/src/shared/SpawnPoint.qc
similarity index 100%
rename from src/shared/NSSpawnPoint.qc
rename to src/shared/SpawnPoint.qc
diff --git a/src/shared/NSClientSpectator.h b/src/shared/Spectator.h
similarity index 100%
rename from src/shared/NSClientSpectator.h
rename to src/shared/Spectator.h
diff --git a/src/shared/NSClientSpectator.qc b/src/shared/Spectator.qc
similarity index 100%
rename from src/shared/NSClientSpectator.qc
rename to src/shared/Spectator.qc
diff --git a/src/shared/NSSpraylogo.h b/src/shared/Spraylogo.h
similarity index 100%
rename from src/shared/NSSpraylogo.h
rename to src/shared/Spraylogo.h
diff --git a/src/shared/NSSpraylogo.qc b/src/shared/Spraylogo.qc
similarity index 100%
rename from src/shared/NSSpraylogo.qc
rename to src/shared/Spraylogo.qc
diff --git a/src/shared/NSSquadMonster.h b/src/shared/SquadMonster.h
similarity index 100%
rename from src/shared/NSSquadMonster.h
rename to src/shared/SquadMonster.h
diff --git a/src/shared/NSSquadMonster.qc b/src/shared/SquadMonster.qc
similarity index 100%
rename from src/shared/NSSquadMonster.qc
rename to src/shared/SquadMonster.qc
diff --git a/src/shared/NSSurfacePropEntity.h b/src/shared/SurfacePropEntity.h
similarity index 100%
rename from src/shared/NSSurfacePropEntity.h
rename to src/shared/SurfacePropEntity.h
diff --git a/src/shared/NSSurfacePropEntity.qc b/src/shared/SurfacePropEntity.qc
similarity index 100%
rename from src/shared/NSSurfacePropEntity.qc
rename to src/shared/SurfacePropEntity.qc
diff --git a/src/shared/NSTalkMonster.h b/src/shared/TalkMonster.h
similarity index 100%
rename from src/shared/NSTalkMonster.h
rename to src/shared/TalkMonster.h
diff --git a/src/shared/NSTalkMonster.qc b/src/shared/TalkMonster.qc
similarity index 100%
rename from src/shared/NSTalkMonster.qc
rename to src/shared/TalkMonster.qc
diff --git a/src/shared/NSTimer.h b/src/shared/Timer.h
similarity index 100%
rename from src/shared/NSTimer.h
rename to src/shared/Timer.h
diff --git a/src/shared/NSTimer.qc b/src/shared/Timer.qc
similarity index 100%
rename from src/shared/NSTimer.qc
rename to src/shared/Timer.qc
diff --git a/src/shared/NSTrigger.h b/src/shared/Trigger.h
similarity index 100%
rename from src/shared/NSTrigger.h
rename to src/shared/Trigger.h
diff --git a/src/shared/NSTrigger.qc b/src/shared/Trigger.qc
similarity index 100%
rename from src/shared/NSTrigger.qc
rename to src/shared/Trigger.qc
diff --git a/src/shared/NSVehicle.h b/src/shared/Vehicle.h
similarity index 100%
rename from src/shared/NSVehicle.h
rename to src/shared/Vehicle.h
diff --git a/src/shared/NSVehicle.qc b/src/shared/Vehicle.qc
similarity index 100%
rename from src/shared/NSVehicle.qc
rename to src/shared/Vehicle.qc
diff --git a/src/shared/NSWeapon.h b/src/shared/Weapon.h
similarity index 100%
rename from src/shared/NSWeapon.h
rename to src/shared/Weapon.h
diff --git a/src/shared/NSWeapon.qc b/src/shared/Weapon.qc
similarity index 100%
rename from src/shared/NSWeapon.qc
rename to src/shared/Weapon.qc
diff --git a/src/shared/defs.h b/src/shared/defs.h
index 74f0cf4d..1f895568 100644
--- a/src/shared/defs.h
+++ b/src/shared/defs.h
@@ -91,47 +91,47 @@ string __fullspawndata;
 #include "../gs-entbase/server/defs.h"
 #endif
 
-#include "NSDecal.h"
+#include "Decal.h"
 
 #include "../botlib/botinfo.h"
 #include "sentences.h"
 
-#include "NSIO.h"
-#include "NSDict.h"
-#include "NSTrigger.h"
-#include "NSEntity.h"
-#include "NSTimer.h"
-#include "NSRenderableEntity.h"
-#include "NSSurfacePropEntity.h"
-#include "NSRagdoll.h"
-#include "NSMoverEntity.h"
-#include "NSPhysicsConstraint.h"
-#include "NSPhysicsEntity.h"
-#include "NSBrushTrigger.h"
-#include "NSPointTrigger.h"
-#include "NSItem.h"
-#include "NSWeapon.h"
-#include "NSNavAI.h"
-#include "NSMonster.h"
-#include "NSSquadMonster.h"
-#include "NSTalkMonster.h"
-#include "NSSpawnPoint.h"
-#include "NSSoundScape.h"
-#include "NSAttack.h"
-#include "NSProjectile.h"
-#include "NSSpraylogo.h"
-#include "NSPortal.h"
-#include "NSSound.h"
-#include "NSDebris.h"
+#include "IO.h"
+#include "Dict.h"
+#include "Trigger.h"
+#include "Entity.h"
+#include "Timer.h"
+#include "RenderableEntity.h"
+#include "SurfacePropEntity.h"
+#include "Ragdoll.h"
+#include "Mover.h"
+#include "PhysicsConstraint.h"
+#include "PhysicsEntity.h"
+#include "BrushTrigger.h"
+#include "PointTrigger.h"
+#include "Item.h"
+#include "Weapon.h"
+#include "Actor.h"
+#include "Monster.h"
+#include "SquadMonster.h"
+#include "TalkMonster.h"
+#include "SpawnPoint.h"
+#include "SoundScape.h"
+#include "Attack.h"
+#include "Projectile.h"
+#include "Spraylogo.h"
+#include "Portal.h"
+#include "Sound.h"
+#include "Debris.h"
 
 #include "../xr/defs.h"
-#include "../botlib/NSBot.h"
-#include "NSClient.h"
-#include "NSClientSpectator.h"
+#include "../botlib/Bot.h"
+#include "Client.h"
+#include "Spectator.h"
 #include "pmove.h"
-#include "NSClientPlayer.h"
+#include "Player.h"
 
-#include "NSVehicle.h"
+#include "Vehicle.h"
 
 #include "materials.h"
 #include "damage.h"
diff --git a/src/shared/include.src b/src/shared/include.src
index 8dd33ea0..8ae75340 100644
--- a/src/shared/include.src
+++ b/src/shared/include.src
@@ -1,47 +1,47 @@
 #includelist
-NSIO.qc
-NSDict.qc
-NSTrigger.qc
-NSEntity.qc
-NSTimer.qc
-NSDecal.qc
-NSRenderableEntity.qc
-NSSurfacePropEntity.qc
-NSMoverEntity.qc
-NSPhysicsConstraint.qc
-NSPhysicsEntity.qc
-NSBrushTrigger.qc
-NSPointTrigger.qc
+IO.qc
+Dict.qc
+Trigger.qc
+Entity.qc
+Timer.qc
+Decal.qc
+RenderableEntity.qc
+SurfacePropEntity.qc
+Mover.qc
+PhysicsConstraint.qc
+PhysicsEntity.qc
+BrushTrigger.qc
+PointTrigger.qc
 pmove.qc
-NSVehicle.qc
-NSAttack.qc
-NSNavAI.qc
-NSMonster.qc
-NSSquadMonster.qc
-NSTalkMonster.qc
-NSProjectile.qc
-NSSpawnPoint.qc
-NSSoundScape.qc
-NSItem.qc
-NSWeapon.qc
-NSPortal.qc
-NSDebris.qc
-NSSound.qc
-NSClient.qc
-NSClientSpectator.qc
+Vehicle.qc
+Attack.qc
+Actor.qc
+Monster.qc
+SquadMonster.qc
+TalkMonster.qc
+Projectile.qc
+SpawnPoint.qc
+SoundScape.qc
+Item.qc
+Weapon.qc
+Portal.qc
+Debris.qc
+Sound.qc
+Client.qc
+Spectator.qc
 pmove_custom.qc
 cloader.qc
 sound.qc
-NSRagdoll.qc
-NSClientPlayer.qc
+Ragdoll.qc
+Player.qc
 player_pmove.qc
 propdata.qc
 surfaceproperties.qc
 decalgroups.qc
 materials.qc
 sentences.qc
-NSCharger.qc
-NSSpraylogo.qc
+Charger.qc
+Spraylogo.qc
 util.qc
 motd.qc
 bodyque.qc
@@ -50,5 +50,5 @@ ammo.qc
 activities.qc
 api.qc
 ../xr/include.src
-../botlib/NSBot.qc
+../botlib/Bot.qc
 #endlist