renaming and sort fixes