Renaming of files and prep for configuration file naming change