Renaming in ng modules
Refactoring fixes