Renamed config variables and added some comments