Normalize "Types" to "Classes"