Renaming to correct file naming conventions