Abdullah - rename of Config keys