Fix name + keys group in tunnel demo
Rename demo