connection-manager: cleanup of hardcoded connection types.

Connection types and their names should be in sync and not hardcoded thru the code.
On the way added better naming to connection type variables.