Fixing name sorting