Unit name fix