Refactoring class names and unlocalized names to make more sense.