Refactor controller names