diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 72417afc44..5fac5d64d9 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6412,7 +6412,7 @@ addrconf6_start_with_link_ready (NMDevice *self)
 	nm_device_ipv6_sysctl_set (self, "accept_ra_rtr_pref", "0");
 
 	priv->ndisc_changed_id = g_signal_connect (priv->ndisc,
-	                                           NM_NDISC_CONFIG_CHANGED,
+	                                           NM_NDISC_CONFIG_RECEIVED,
 	                                           G_CALLBACK (ndisc_config_changed),
 	                                           self);
 	priv->ndisc_timeout_id = g_signal_connect (priv->ndisc,
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 01415cf5c5..eaadc82cea 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -1217,7 +1217,7 @@ nm_ndisc_class_init (NMNDiscClass *klass)
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	signals[CONFIG_CHANGED] =
-	    g_signal_new (NM_NDISC_CONFIG_CHANGED,
+	    g_signal_new (NM_NDISC_CONFIG_RECEIVED,
 	                  G_OBJECT_CLASS_TYPE (klass),
 	                  G_SIGNAL_RUN_FIRST,
 	                  0,
diff --git a/src/ndisc/nm-ndisc.h b/src/ndisc/nm-ndisc.h
index ef58e23854..bc4ebe265c 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/ndisc/nm-ndisc.h
@@ -45,8 +45,8 @@
 #define NM_NDISC_ROUTER_SOLICITATIONS "router-solicitations"
 #define NM_NDISC_ROUTER_SOLICITATION_INTERVAL "router-solicitation-interval"
 
-#define NM_NDISC_CONFIG_CHANGED "config-changed"
-#define NM_NDISC_RA_TIMEOUT     "ra-timeout"
+#define NM_NDISC_CONFIG_RECEIVED "config-received"
+#define NM_NDISC_RA_TIMEOUT      "ra-timeout"
 
 typedef enum {
 	NM_NDISC_DHCP_LEVEL_UNKNOWN,
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index 09644232cc..dce066eaf8 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -185,7 +185,7 @@ test_simple (void)
 	nm_fake_ndisc_add_dns_domain (ndisc, id, "foobar.com", now, 10);
 
 	g_signal_connect (ndisc,
-	                  NM_NDISC_CONFIG_CHANGED,
+	                  NM_NDISC_CONFIG_RECEIVED,
 	                  G_CALLBACK (test_simple_changed),
 	                  &data);
 
@@ -280,7 +280,7 @@ test_everything (void)
 	nm_fake_ndisc_add_dns_domain (ndisc, id, "foobar2.com", now, 10);
 
 	g_signal_connect (ndisc,
-	                  NM_NDISC_CONFIG_CHANGED,
+	                  NM_NDISC_CONFIG_RECEIVED,
 	                  G_CALLBACK (test_everything_changed),
 	                  &data);
 	g_signal_connect (ndisc,
@@ -366,7 +366,7 @@ test_preference (void)
 	nm_fake_ndisc_add_prefix (ndisc, id, "2001:db8:a:a::", 64, "fe80::1", now, 10, 10, 15);
 
 	g_signal_connect (ndisc,
-	                  NM_NDISC_CONFIG_CHANGED,
+	                  NM_NDISC_CONFIG_RECEIVED,
 	                  G_CALLBACK (test_preference_changed),
 	                  &data);
 
@@ -444,7 +444,7 @@ test_dns_solicit_loop (void)
 	nm_fake_ndisc_add_dns_server (ndisc, id, "2001:db8:c:c::1", now, 6);
 
 	g_signal_connect (ndisc,
-	                  NM_NDISC_CONFIG_CHANGED,
+	                  NM_NDISC_CONFIG_RECEIVED,
 	                  G_CALLBACK (test_dns_solicit_loop_changed),
 	                  &data);
 	g_signal_connect (ndisc,
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 12218a662c..a18f9902d7 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -520,7 +520,7 @@ main (int argc, char *argv[])
 		                  G_CALLBACK (ip6_address_changed),
 		                  ndisc);
 		g_signal_connect (ndisc,
-		                  NM_NDISC_CONFIG_CHANGED,
+		                  NM_NDISC_CONFIG_RECEIVED,
 		                  G_CALLBACK (ndisc_config_changed),
 		                  NULL);
 		g_signal_connect (ndisc,