diff --git a/ChangeLog b/ChangeLog
index 5b09df9652..b150a409be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-11-20  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting.c
+	  libnm-util/nm-setting.h
+	  libnm-util/libnm-util.ver
+		- (nm_setting_new_from_hash): rename from nm_setting_from_hash() to be
+			consistent with nm_connection_new_from_hash()
+
+	* src/nm-activation-request.c
+	  libnm-util/nm-connection.c
+		- Handle rename
+
 2008-11-19  Dan Williams  <dcbw@redhat.com>
 
 	* configure.in
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index 73a93b25f4..3444ef7895 100644
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -84,7 +84,7 @@ global:
 	nm_setting_connection_get_read_only;
 	nm_setting_duplicate;
 	nm_setting_enumerate_values;
-	nm_setting_from_hash;
+	nm_setting_new_from_hash;
 	nm_setting_get_name;
 	nm_setting_get_type;
 	nm_setting_gsm_error_get_type;
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 83e699b607..ebd32f88a7 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -332,7 +332,7 @@ parse_one_setting (gpointer key, gpointer value, gpointer user_data)
 
 	type = nm_connection_lookup_setting_type ((char *) key);
 	if (type)
-		setting = nm_setting_from_hash (type, (GHashTable *) value);
+		setting = nm_setting_new_from_hash (type, (GHashTable *) value);
 	if (setting)
 		nm_connection_add_setting (connection, setting);
 }
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index c319a5d301..62a012d5e3 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -141,8 +141,8 @@ one_property_cb (gpointer key, gpointer val, gpointer user_data)
 }
 
 NMSetting *
-nm_setting_from_hash (GType setting_type,
-				  GHashTable *hash)
+nm_setting_new_from_hash (GType setting_type,
+                          GHashTable *hash)
 {
 	NMSetting *setting;
 	NMSettingFromHashInfo info;
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index 833756b27b..5eb92b3b77 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -74,8 +74,8 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting,
 GType nm_setting_get_type (void);
 
 GHashTable *nm_setting_to_hash       (NMSetting *setting);
-NMSetting  *nm_setting_from_hash     (GType setting_type,
-							   GHashTable *hash);
+NMSetting  *nm_setting_new_from_hash (GType setting_type,
+                                      GHashTable *hash);
 
 NMSetting *nm_setting_duplicate      (NMSetting *setting);
 
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 454fa9af12..47df80e36f 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -418,7 +418,7 @@ update_one_setting (const char* key,
 	if (type == 0)
 		return;
 
-	setting = nm_setting_from_hash (type, setting_hash);
+	setting = nm_setting_new_from_hash (type, setting_hash);
 	if (setting) {
 		NMSetting *s_8021x = NULL;
 		GSList *all_settings = NULL;