diff --git a/src/server/info_player_teamspawn.qc b/src/server/info_player_teamspawn.qc
index c747df2..abc372b 100644
--- a/src/server/info_player_teamspawn.qc
+++ b/src/server/info_player_teamspawn.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-class info_player_teamspawn:CBaseTrigger
+class info_player_teamspawn:NSRenderableEntity
 {
 	void(void) info_player_teamspawn;
 };
diff --git a/src/server/info_tfgoal.qc b/src/server/info_tfgoal.qc
index aaff2be..b9e96e6 100644
--- a/src/server/info_tfgoal.qc
+++ b/src/server/info_tfgoal.qc
@@ -59,7 +59,7 @@ typedef enumflags
 } tfgoal_result;
 
 /* point entity version */
-class info_tfgoal:CBaseTrigger
+class info_tfgoal:NSRenderableEntity
 {
 	string m_strName;
 	string m_strActivatedSound;
@@ -387,7 +387,7 @@ info_tfgoal::SpawnKey(string strKey, string strValue)
 		m_iMedikit = stoi(strValue);
 		break;
 	default:
-		CBaseTrigger::SpawnKey(strKey, strValue);
+		super::SpawnKey(strKey, strValue);
 		break;
 	}
 }
@@ -404,7 +404,7 @@ info_tfgoal::info_tfgoal(void)
 
 	precache_sound(m_strActivatedSound);
 
-	CBaseEntity::CBaseEntity();
+	super::NSRenderableEntity();
 	info_tfgoal::Respawn();
 }
 
@@ -436,7 +436,7 @@ i_t_g::i_t_g(void)
 		SpawnKey(argv(i), argv(i+1));
 	}
 
-	CBaseEntity::CBaseEntity();
+	super::NSRenderableEntity();
 
 	precache_sound(m_strActivatedSound);
 	Respawn();
diff --git a/src/server/item_tfgoal.qc b/src/server/item_tfgoal.qc
index 1d31d24..688ceea 100644
--- a/src/server/item_tfgoal.qc
+++ b/src/server/item_tfgoal.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-class item_tfgoal:CBaseTrigger
+class item_tfgoal:NSRenderableEntity
 {
 	float m_dItemID;
 
@@ -40,19 +40,19 @@ class item_tfgoal:CBaseTrigger
 	string m_voxNonOwnerTeams;  /* non-owner team */
 
 	void(void) item_tfgoal;
-	virtual void(void) touch;
+	virtual void(entity) Touch;
 	virtual void(void) Respawn;
 	virtual void(string, string) SpawnKey;
 };
 
 void
-item_tfgoal::touch(void)
+item_tfgoal::Touch(entity eToucher)
 {
-	if (other.classname != "player") {
+	if (eToucher.classname != "player") {
 		return;
 	}
 
-	player pl = (player)other;
+	player pl = (player)eToucher;
 
 	/* team filter */
 	if (m_iTeamUses)
@@ -182,6 +182,7 @@ item_tfgoal::SpawnKey(string strKey, string strValue)
 		m_voxNonOwnerTeams = strValue;  /* non-owner team */
 		break;
 	default:
+		super::SpawnKey(strKey, strValue);
 		break;
 	}
 }
@@ -194,6 +195,6 @@ item_tfgoal::item_tfgoal(void)
 	}
 	precache_sound(m_strSound);
 
-	CBaseEntity::CBaseEntity();
+	super::NSRenderableEntity();
 	item_tfgoal::Respawn();
 }