diff --git a/bulkdata/src/datamodel.c b/bulkdata/src/datamodel.c
index 2eafb0ef8..8aa196c46 100644
--- a/bulkdata/src/datamodel.c
+++ b/bulkdata/src/datamodel.c
@@ -118,7 +118,7 @@ static int addObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data,
 	last_inst = get_last_instance_bbfdm("dmmap_bulkdata", "profile", "profile_instance");
 	snprintf(prof_id, sizeof(prof_id), "%d", last_inst ? atoi(last_inst)+1 : 1);
 
-	dmuci_add_section_and_rename("bulkdata", "profile", &profile, &value);
+	dmuci_add_section("bulkdata", "profile", &profile, &value);
 	dmuci_set_value_by_section(profile, "profile_id", prof_id);
 	dmuci_set_value_by_section(profile, "enable", "0");
 	dmuci_set_value_by_section(profile, "nbre_of_retained_failed_reports", "0");
@@ -228,7 +228,7 @@ static int addObjBulkDataProfileParameter(char *refparam, struct dmctx *ctx, voi
 
 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_parameter", "parameter_instance", "profile_id", prev_profile_id);
 
-	dmuci_add_section_and_rename("bulkdata", "profile_parameter", &profile_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_parameter", &profile_parameter, &value);
 	dmuci_set_value_by_section(profile_parameter, "profile_id", prev_profile_id);
 
 	browse_args.option = "profile_id";
@@ -282,7 +282,7 @@ static int addObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct d
 
 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_http_request_uri_parameter", "requesturiparameter_instance", "profile_id", prev_profile_id);
 
-	dmuci_add_section_and_rename("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter, &value);
 	dmuci_set_value_by_section(profile_http_request_uri_parameter, "profile_id", prev_profile_id);
 
 	browse_args.option = "profile_id";
diff --git a/udpechoserver/src/datamodel.c b/udpechoserver/src/datamodel.c
index bdb09553a..5f5e01cf6 100644
--- a/udpechoserver/src/datamodel.c
+++ b/udpechoserver/src/datamodel.c
@@ -144,7 +144,7 @@ static int get_IPDiagnosticsUDPEchoConfig_EchoPlusSupported(char *refparam, stru
 static inline char *udpechoconfig_get(char *option, char *def)
 {
 	char *tmp;
-	dmuci_get_varstate_string("udpechoserver", "udpechoserver", option, &tmp);
+	varstate_get_value_string("udpechoserver", "udpechoserver", option, &tmp);
 	if(tmp && tmp[0] == '\0')
 		return dmstrdup(def);
 	else
diff --git a/xmpp/src/datamodel.c b/xmpp/src/datamodel.c
index a170e1fd0..6edc5590c 100644
--- a/xmpp/src/datamodel.c
+++ b/xmpp/src/datamodel.c
@@ -32,14 +32,14 @@ static int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, ch
 	last_inst = get_last_instance_bbfdm("dmmap_xmpp", "connection", "con_inst");
 	dmasprintf(&id, "%d", (last_inst) ? atoi(last_inst) + 1 : 1);
 
-	dmuci_add_section_and_rename("xmpp", "connection", &xmpp_con, &con_name);
+	dmuci_add_section("xmpp", "connection", &xmpp_con, &con_name);
 	dmuci_set_value_by_section(xmpp_con, "xmpp_id", id);
 	dmuci_set_value_by_section(xmpp_con, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con, "interval", "30");
 	dmuci_set_value_by_section(xmpp_con, "attempt", "16");
 	dmuci_set_value_by_section(xmpp_con, "serveralgorithm", "DNS-SRV");
 
-	dmuci_add_section_and_rename("xmpp", "connection_server", &xmpp_con_srv, &con_srv_name);
+	dmuci_add_section("xmpp", "connection_server", &xmpp_con_srv, &con_srv_name);
 	dmuci_set_value_by_section(xmpp_con_srv, "con_id", id);
 	dmuci_set_value_by_section(xmpp_con_srv, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con_srv, "port", "5222");