diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 443b13dc..fb30d964 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -3640,7 +3640,7 @@ AttractiveNode::AttractiveNode()
 	m_fMaxDistanceSquared	= m_fMaxDistance * m_fMaxDistance;
 	m_fRespawnTime			= 15.0f;	// set to default 15 seconds
 	m_bUse					= false;
-	m_csTeam				= STRING_NONE;
+	m_csTeam				= STRING_EMPTY;
 	m_iTeam					= TEAM_NONE;
 
 	attractiveNodes.AddObject( this );
@@ -3786,7 +3786,7 @@ void AttractiveNode::SetTeam
 {
 	if( ev->IsNilAt( 1 ) )
 	{
-		m_csTeam = STRING_NONE;
+		m_csTeam = STRING_EMPTY;
 		m_iTeam = TEAM_NONE;
 		return;
 	}
@@ -3795,7 +3795,7 @@ void AttractiveNode::SetTeam
 
 	switch( m_csTeam )
 	{
-	case STRING_NONE:
+	case STRING_EMPTY:
 		m_iTeam = TEAM_NONE;
 		break;
 	case STRING_SPECTATOR:
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 0baa5adb..af467c32 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -289,9 +289,10 @@ const char *ScriptMaster::ConstStrings[] =
 	"turndone",
 	"anim/no_anim_killed.scr",
 	"mg42", "mp40",
-	"remove", "delete",
-	"respawn",
-	"none"
+	"auto",
+	"both",
+	"runandshoot",
+	"respawn"
 };
 
 ScriptMaster::~ScriptMaster()
diff --git a/code/qcommon/const_str.h b/code/qcommon/const_str.h
index 7956e8cb..ae61bc40 100644
--- a/code/qcommon/const_str.h
+++ b/code/qcommon/const_str.h
@@ -123,9 +123,10 @@ enum
 	STRING_TURNDONE,
 	STRING_ANIM_NO_KILLED_SCR,
 	STRING_MG42, STRING_MP40,
-	STRING_REMOVE, STRING_DELETE,
+	STRING_AUTO,
+	STRING_BOTH,
+	STRING_RUNANDSHOOT,
 	STRING_RESPAWN,
-	STRING_NONE,
 	STRING_LENGTH_
 };
 
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index da869301..322d40ce 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -3631,7 +3631,7 @@ void Listener::Unregister( const_str name )
 
 				if( listener )
 				{
-					if( listener == this && ( name == STRING_REMOVE || name == STRING_DELETE || bDeleteSelf ) )
+					if( listener == this && ( bDeleteSelf ) )
 					{
 						continue;
 					}