Removed hyphens from nameType attributes