refactored config key names