Names fixes, new sorting factor