Replace 'cmd' with 'Command' and 'alt' with 'Option' following Apple conventions