Merge "Change "connection type" to "connection types""