Renaming to match more closely with AngularJS conventions.