more sort stuff + legacy renaming