cleaning up the demo names