Clean up demos
Rename things to be less silly