diff --git a/src/name.cpp b/src/name.cpp
index 36cce2595..07482ec52 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -182,6 +182,7 @@ void FName::NameManager::InitBuckets ()
 	// Register built-in names. 'None' must be name 0.
 	for (size_t i = 0; i < countof(PredefinedNames); ++i)
 	{
+		assert(NULL == FindName(PredefinedNames[i], true) && "Predefined name already inserted");
 		FindName (PredefinedNames[i], false);
 	}
 }
diff --git a/src/namedef.h b/src/namedef.h
index ed9f9183b..9d8496280 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -595,9 +595,6 @@ xx(string)
 xx(vector)
 xx(map)
 xx(array)
-xx(name)
 xx(sound)
-xx(color)
 xx(state)
 xx(fixed)
-xx(angle)