Renames controllers to avoid unpr