fix-prefs

Last-minute adjustments to some preference names.

This also closes #759.