Rename keys to match their settings. Fix settings so that they don't get appended, and they get cleared when an empty string is specified. Update python bindings to reflect list changes.