Changes some 'off'/'on' to boolean, renames some things