(Chore) rollback name changes.