update the mac settings components naming to be less specific to mac os - [x] Manual QA for all new/changed functionality