It took me way too long to find how to change the keyboard modifier keys in the new mac System Settings app. Keyboard -> Keyboard Stortcuts -> Modifier Keys (bottom of the list on the left)