Fixing bad name format