Update the demo directory to use the version 8 type naming conventions.
639 files changed