naming refactoring and Angular caching