Unify names for demos and keep them shorter

Change-Id: I5a30c1bb3faa75dce6e8d59fcd86e42efab9f69c