#1920: Add name token

As per #1920 Add token for connection name (no more accidental overwites of exposrts of DB's with same name from other connections)