diff --git a/src/devices/nm-device-olpc-mesh.c b/src/devices/nm-device-olpc-mesh.c
index 1e778113c..19c86975c 100644
--- a/src/devices/nm-device-olpc-mesh.c
+++ b/src/devices/nm-device-olpc-mesh.c
@@ -128,12 +128,12 @@ constructor (GType type,
 
 	self = NM_DEVICE_OLPC_MESH (object);
 
-	nm_log_dbg (LOGD_HW | LOGD_OLPC_MESH, "(%s): kernel ifindex %d",
+	nm_log_dbg (LOGD_HW | LOGD_OLPC, "(%s): kernel ifindex %d",
 	            nm_device_get_iface (NM_DEVICE (self)),
 	            nm_device_get_ifindex (NM_DEVICE (self)));
 
 	if (!nm_platform_wifi_get_capabilities (nm_device_get_ifindex (NM_DEVICE (self)), &caps)) {
-		nm_log_warn (LOGD_HW | LOGD_OLPC_MESH, "(%s): failed to initialize WiFi driver",
+		nm_log_warn (LOGD_HW | LOGD_OLPC, "(%s): failed to initialize WiFi driver",
 		             nm_device_get_iface (NM_DEVICE (self)));
 		g_object_unref (object);
 		return NULL;
@@ -244,14 +244,14 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
 
 	/* disconnect companion device, if it is connected */
 	if (nm_device_get_act_request (NM_DEVICE (priv->companion))) {
-		nm_log_info (LOGD_OLPC_MESH, "(%s): disconnecting companion device %s",
+		nm_log_info (LOGD_OLPC, "(%s): disconnecting companion device %s",
 		             nm_device_get_iface (dev),
 		             nm_device_get_iface (priv->companion));
 		/* FIXME: VPN stuff here is a bug; but we can't really change API now... */
 		nm_device_state_changed (NM_DEVICE (priv->companion),
 		                         NM_DEVICE_STATE_DISCONNECTED,
 		                         NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED);
-		nm_log_info (LOGD_OLPC_MESH, "(%s): companion %s disconnected",
+		nm_log_info (LOGD_OLPC, "(%s): companion %s disconnected",
 		             nm_device_get_iface (dev),
 		             nm_device_get_iface (priv->companion));
 	}
@@ -478,7 +478,7 @@ companion_state_changed_cb (NMDeviceWifi *companion,
 	    || state > NM_DEVICE_STATE_ACTIVATED)
 		return;
 
-	nm_log_dbg (LOGD_OLPC_MESH, "(%s): disconnecting mesh due to companion connectivity",
+	nm_log_dbg (LOGD_OLPC, "(%s): disconnecting mesh due to companion connectivity",
 	            nm_device_get_iface (NM_DEVICE (self)));
 	/* FIXME: VPN stuff here is a bug; but we can't really change API now... */
 	nm_device_state_changed (NM_DEVICE (self),
@@ -535,7 +535,7 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other)
 	                         NM_DEVICE_STATE_DISCONNECTED,
 	                         NM_DEVICE_STATE_REASON_NONE);
 
-	nm_log_info (LOGD_OLPC_MESH, "(%s): found companion WiFi device %s",
+	nm_log_info (LOGD_OLPC, "(%s): found companion WiFi device %s",
 	             nm_device_get_iface (NM_DEVICE (self)),
 	             nm_device_get_iface (other));
 
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
index 71322bac8..5d1c4b972 100644
--- a/src/logging/nm-logging.c
+++ b/src/logging/nm-logging.c
@@ -47,7 +47,7 @@ nm_log_handler (const gchar *log_domain,
 	 LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_WIFI_SCAN | LOGD_IP4 | \
 	 LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \
 	 LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
-	 LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \
+	 LOGD_CORE | LOGD_DEVICE | LOGD_OLPC | LOGD_WIMAX | \
 	 LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \
 	 LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK | \
 	 LOGD_DCB | LOGD_DISPATCH)
@@ -97,7 +97,7 @@ static const LogDesc domain_descs[] = {
 	{ LOGD_SUSPEND,   "SUSPEND" },
 	{ LOGD_CORE,      "CORE" },
 	{ LOGD_DEVICE,    "DEVICE" },
-	{ LOGD_OLPC_MESH, "OLPC" },
+	{ LOGD_OLPC,      "OLPC" },
 	{ LOGD_WIMAX,     "WIMAX" },
 	{ LOGD_INFINIBAND,"INFINIBAND" },
 	{ LOGD_FIREWALL,  "FIREWALL" },
diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h
index 8287ab9b9..c3984483e 100644
--- a/src/logging/nm-logging.h
+++ b/src/logging/nm-logging.h
@@ -50,7 +50,7 @@ enum {
 	LOGD_SUSPEND    = (1LL << 20), /* Suspend/Resume */
 	LOGD_CORE       = (1LL << 21), /* Core daemon and policy stuff */
 	LOGD_DEVICE     = (1LL << 22), /* Device state and activation */
-	LOGD_OLPC_MESH  = (1LL << 23),
+	LOGD_OLPC       = (1LL << 23),
 	LOGD_WIMAX      = (1LL << 24),
 	LOGD_INFINIBAND = (1LL << 25),
 	LOGD_FIREWALL   = (1LL << 26),
diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index a042944c2..cc94b69a3 100644
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -411,7 +411,7 @@ wifi_wext_set_mesh_channel (WifiData *data, guint32 channel)
 	}
 
 	if (ioctl (wext->fd, SIOCSIWFREQ, &wrq) < 0) {
-		nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH,
+		nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC,
 		            "(%s): error setting channel to %d: %s",
 		            wext->parent.iface, channel, strerror (errno));
 		return FALSE;
@@ -442,7 +442,7 @@ wifi_wext_set_mesh_ssid (WifiData *data, const GByteArray *ssid)
 		return TRUE;
 
 	if (errno != ENODEV) {
-		nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH,
+		nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC,
 		            "(%s): error setting SSID to '%s': %s",
 		            wext->parent.iface,
 		            ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(null)",