name fixes and sorting