Fix name determinator