Register Name Sorting + Bugfix