Fix names/descriptions of some configuration keys