[Ben] some renaming
Merge branch 'master' of https://github.com/frankcr/angulartest