Change names of demo pages
Merge with remote