Fix missing re-names following last commit