Changed config file names to be class variables