Fix key names, documentation, config scope.