My January '66 has the wrong keys, It's got this type:

Shouldn't it have this type or similar with VW sideways etc:

How would I be able to change back?
Is it a case of replacing all the bocks and barrels?
These are the door handles:

Are they correct??
Thanks for your help!!