Cleanups to naming and ensure that all demos submit rather than save