Command and Option keys reversed?

Have I lost my mind - or did Lion mess with these to make them act like Windoze boxes?

Just checking since I don't own an "official" Apple keyboard other than my MacBook Pro - which behaves normally, in Snow. But my Kensington wireless and cheap Chinese utility keyboard both changed on the new Mini I just bought.

All of a sudden my simple keyboard things like SelectAll/Copy/Paste etc. were all messed up from the way I've been doing it on Macs since the mid 80s!

One can correct this in System Preferences/Keyboard/Modifier Keys - but.... really? 😮