Changed the code naming style according to agreed guideline