Rename some configuration parameters. Fixes #4294