Using controllerAs syntax for all controllers.

Makes explicit where view variables are coming from.
Update tests for controllerAs changes.