What he shows is correct, unless the original switch failed at the same time as rewiring it it'll be wired incorrectly.
the switches are generally laid out in a triangle with the common on it's ownand the matching physical locations should be 'matched'
Earthwires not shown for clarity
The...