Renaming files

Renaming files as per the suggested naming conventions