Unit name refactoring