Modfiy the name format