demos: Update demos to new conventions.