Make names of config groups and keys more consistent.