Started on upgrade functionality; Renamed settings values to match the old ones so it will be more efficient to run the upgrade