Refacorted the naming conventions for the files