File names changed

File names changed as per the naming convention