Refactor controllerAs names