Refactoring Day One: Kill that stupid type name.