Revert controller renames