#1127 Made suggested changes to naming conventions of the Context Configurations and File names