Naming refactoring on latest added types.