Refactoring and file renaming

To have consistent file name