Better naming for connection and device types