diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 6d5086df0d..a8a02ced65 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -289,13 +289,13 @@ devices.
 
 %if %{with ovs}
 %package ovs
-Summary: OpenVSwitch device plugin for NetworkManager
+Summary: Open vSwitch device plugin for NetworkManager
 Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: openvswitch
 
 %description ovs
-This package contains NetworkManager support for OpenVSwitch bridges.
+This package contains NetworkManager support for Open vSwitch bridges.
 %endif
 
 
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index c8e442f478..8e0882ff1a 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -211,9 +211,9 @@ typedef enum {
  * @NM_DEVICE_TYPE_MACSEC: a MACsec interface
  * @NM_DEVICE_TYPE_DUMMY: a dummy interface
  * @NM_DEVICE_TYPE_PPP: a PPP interface
- * @NM_DEVICE_TYPE_OVS_INTERFACE: a OpenVSwitch interface
- * @NM_DEVICE_TYPE_OVS_PORT: a OpenVSwitch port
- * @NM_DEVICE_TYPE_OVS_BRIDGE: a OpenVSwitch bridge
+ * @NM_DEVICE_TYPE_OVS_INTERFACE: a Open vSwitch interface
+ * @NM_DEVICE_TYPE_OVS_PORT: a Open vSwitch port
+ * @NM_DEVICE_TYPE_OVS_BRIDGE: a Open vSwitch bridge
  * @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device
  * @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface
  *
@@ -556,7 +556,7 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_NEW_ACTIVATION: New connection activation was enqueued
  * @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed
  * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
- * @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with OpenVSwitch database
+ * @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with Open vSwitch database
  * @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected
  * @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported
  *
diff --git a/libnm-core/nm-setting-ovs-bridge.c b/libnm-core/nm-setting-ovs-bridge.c
index fbae95d0c9..4993d13fd9 100644
--- a/libnm-core/nm-setting-ovs-bridge.c
+++ b/libnm-core/nm-setting-ovs-bridge.c
@@ -28,10 +28,10 @@
 
 /**
  * SECTION:nm-setting-ovs-bridge
- * @short_description: Describes connection properties for OpenVSwitch bridges.
+ * @short_description: Describes connection properties for Open vSwitch bridges.
  *
  * The #NMSettingOvsBridge object is a #NMSetting subclass that describes properties
- * necessary for OpenVSwitch bridges.
+ * necessary for Open vSwitch bridges.
  **/
 
 enum {
diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c
index 73e1cfc6ae..ff9e4c1db1 100644
--- a/libnm-core/nm-setting-ovs-interface.c
+++ b/libnm-core/nm-setting-ovs-interface.c
@@ -27,10 +27,10 @@
 
 /**
  * SECTION:nm-setting-ovs-interface
- * @short_description: Describes connection properties for OpenVSwitch interfaces.
+ * @short_description: Describes connection properties for Open vSwitch interfaces.
  *
  * The #NMSettingOvsInterface object is a #NMSetting subclass that describes properties
- * necessary for OpenVSwitch interfaces.
+ * necessary for Open vSwitch interfaces.
  **/
 
 enum {
@@ -42,7 +42,7 @@ enum {
 /**
  * NMSettingOvsInterface:
  *
- * OpenVSwitch Interface Settings
+ * Open vSwitch Interface Settings
  */
 struct _NMSettingOvsInterface {
 	NMSetting parent;
diff --git a/libnm-core/nm-setting-ovs-patch.c b/libnm-core/nm-setting-ovs-patch.c
index 3689aecf8c..980015f2a1 100644
--- a/libnm-core/nm-setting-ovs-patch.c
+++ b/libnm-core/nm-setting-ovs-patch.c
@@ -28,10 +28,10 @@
 
 /**
  * SECTION:nm-setting-ovs-patch
- * @short_description: Describes connection properties for OpenVSwitch patch interfaces.
+ * @short_description: Describes connection properties for Open vSwitch patch interfaces.
  *
  * The #NMSettingOvsPatch object is a #NMSetting subclass that describes properties
- * necessary for OpenVSwitch interfaces of type "patch".
+ * necessary for Open vSwitch interfaces of type "patch".
  **/
 
 enum {
@@ -195,7 +195,7 @@ nm_setting_ovs_patch_class_init (NMSettingOvsPatchClass *setting_class)
 	/**
 	 * NMSettingOvsPatch:peer:
 	 *
-	 * Specifies the unicast destination IP address of a remote OpenVSwitch
+	 * Specifies the unicast destination IP address of a remote Open vSwitch
 	 * bridge port to connect to.
 	 *
 	 * Since: 1.10
diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c
index 72722b1571..b61df0cef4 100644
--- a/libnm-core/nm-setting-ovs-port.c
+++ b/libnm-core/nm-setting-ovs-port.c
@@ -28,10 +28,10 @@
 
 /**
  * SECTION:nm-setting-ovs-port
- * @short_description: Describes connection properties for OpenVSwitch ports.
+ * @short_description: Describes connection properties for Open vSwitch ports.
  *
  * The #NMSettingOvsPort object is a #NMSetting subclass that describes properties
- * necessary for OpenVSwitch ports.
+ * necessary for Open vSwitch ports.
  **/
 
 enum {
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index d872df7b51..8c594d28b1 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -1310,11 +1310,11 @@ get_type_name (NMDevice *device)
 	case NM_DEVICE_TYPE_OLPC_MESH:
 		return _("OLPC Mesh");
 	case NM_DEVICE_TYPE_OVS_INTERFACE:
-		return _("OpenVSwitch Interface");
+		return _("Open vSwitch Interface");
 	case NM_DEVICE_TYPE_OVS_PORT:
-		return _("OpenVSwitch Port");
+		return _("Open vSwitch Port");
 	case NM_DEVICE_TYPE_OVS_BRIDGE:
-		return _("OpenVSwitch Bridge");
+		return _("Open vSwitch Bridge");
 	case NM_DEVICE_TYPE_WIMAX:
 		return _("WiMAX");
 	case NM_DEVICE_TYPE_MODEM:
diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/devices/ovs/nm-ovs-factory.c
index 830f94fc0c..766c650bf1 100644
--- a/src/devices/ovs/nm-ovs-factory.c
+++ b/src/devices/ovs/nm-ovs-factory.c
@@ -80,14 +80,14 @@ new_device_from_type (const char *name, NMDeviceType device_type)
 
 	if (device_type == NM_DEVICE_TYPE_OVS_INTERFACE) {
 		type = NM_TYPE_DEVICE_OVS_INTERFACE;
-		type_desc = "OpenVSwitch Interface";
+		type_desc = "Open vSwitch Interface";
 		link_type = NM_LINK_TYPE_OPENVSWITCH;
 	} else if (device_type == NM_DEVICE_TYPE_OVS_PORT) {
 		type = NM_TYPE_DEVICE_OVS_PORT;
-		type_desc = "OpenVSwitch Port";
+		type_desc = "Open vSwitch Port";
 	} else if (device_type == NM_DEVICE_TYPE_OVS_BRIDGE) {
 		type = NM_TYPE_DEVICE_OVS_BRIDGE;
-		type_desc = "OpenVSwitch Bridge";
+		type_desc = "Open vSwitch Bridge";
 	} else {
 		return NULL;
 	}