Fix name sorting