more ng-prefix renaming