Housekeeping: Renaming stuff so it actually sorts properly