Update demo with name and ctor changes.
Update demo with name and ctor changes.

tomfisher/tripleplay,joansmith/tripleplay,tomfisher/tripleplay,joansmith/tripleplay,joansmith/tripleplay,joansmith/tripleplay,tomfisher/tripleplay,tomfisher/tripleplay,joansmith/tripleplay,tomfisher/tripleplay