Rename on-connection-* into tunnel-*

   .. and simplify related code.