Fix examples according to latest m2x client code
Move examples to new names