Update coding style and rename config params

Bring it in line with the rest of the project and use names that are
less likely to incite a murderous rage in people writing config files.