I don't think we want "Class" in any of these type names.