Upgrade demos to use new-style class-names, MKWS-306