First stage of renaming config variables to match new uses - WiP
Stage two of updating config variable names....