Name format fix