Name formatting fix