Cosmetic details
Revert preference keys to what they were previously, so that on upgrade preferences are remembered. (Change introduced by bad find/replace in commit c880f02)