diff --git a/src/main.c b/src/main.c
index a8964c0834..3ab78e66e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -424,7 +424,7 @@ main (int argc, char *argv[])
 	 */
 	dbus_glib_global_set_disable_legacy_property_access ();
 
-	nm_log_info (LOGD_CORE, "Read config: %s", nm_config_get_description (config));
+	nm_log_info (LOGD_CORE, "Read config: %s", nm_config_get_config_description (config));
 	nm_log_info (LOGD_CORE, "WEXT support is %s",
 #if HAVE_WEXT
 	             "enabled"
diff --git a/src/nm-config.c b/src/nm-config.c
index a1489512f7..c844575461 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -40,7 +40,7 @@
 #define NM_NO_AUTO_DEFAULT_STATE_FILE  NMSTATEDIR "/no-auto-default.state"
 
 struct NMConfigCmdLineOptions {
-	char *config_path;
+	char *config_main_file;
 	char *config_dir;
 	char *no_auto_default_file;
 	char *plugins;
@@ -59,7 +59,7 @@ typedef struct {
 	NMConfigData *config_data;
 	NMConfigData *config_data_orig;
 
-	char *nm_conf_path;
+	char *config_main_file;
 	char *config_dir;
 	char *config_description;
 	char *no_auto_default_file;
@@ -151,15 +151,15 @@ nm_config_get_data_orig (NMConfig *config)
 }
 
 const char *
-nm_config_get_path (NMConfig *config)
+nm_config_get_config_main_file (NMConfig *config)
 {
 	g_return_val_if_fail (config != NULL, NULL);
 
-	return NM_CONFIG_GET_PRIVATE (config)->nm_conf_path;
+	return NM_CONFIG_GET_PRIVATE (config)->config_main_file;
 }
 
 const char *
-nm_config_get_description (NMConfig *config)
+nm_config_get_config_description (NMConfig *config)
 {
 	g_return_val_if_fail (config != NULL, NULL);
 
@@ -365,7 +365,7 @@ nm_config_set_ethernet_no_auto_default (NMConfig *config, NMDevice *device)
 static void
 _nm_config_cmd_line_options_clear (NMConfigCmdLineOptions *cli)
 {
-	g_clear_pointer (&cli->config_path, g_free);
+	g_clear_pointer (&cli->config_main_file, g_free);
 	g_clear_pointer (&cli->config_dir, g_free);
 	g_clear_pointer (&cli->no_auto_default_file, g_free);
 	g_clear_pointer (&cli->plugins, g_free);
@@ -383,7 +383,7 @@ _nm_config_cmd_line_options_copy (const NMConfigCmdLineOptions *cli, NMConfigCmd
 
 	_nm_config_cmd_line_options_clear (dst);
 	dst->config_dir = g_strdup (cli->config_dir);
-	dst->config_path = g_strdup (cli->config_path);
+	dst->config_main_file = g_strdup (cli->config_main_file);
 	dst->no_auto_default_file = g_strdup (cli->no_auto_default_file);
 	dst->plugins = g_strdup (cli->plugins);
 	dst->connectivity_uri = g_strdup (cli->connectivity_uri);
@@ -418,7 +418,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli,
 
 	{
 		GOptionEntry config_options[] = {
-			{ "config", 0, 0, G_OPTION_ARG_FILENAME, &cli->config_path, N_("Config file location"), N_("/path/to/config.file") },
+			{ "config", 0, 0, G_OPTION_ARG_FILENAME, &cli->config_main_file, N_("Config file location"), N_("/path/to/config.file") },
 			{ "config-dir", 0, 0, G_OPTION_ARG_FILENAME, &cli->config_dir, N_("Config directory location"), N_("/path/to/config/dir") },
 			{ "no-auto-default", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &cli->no_auto_default_file, "no-auto-default.state location", NULL },
 			{ "plugins", 0, 0, G_OPTION_ARG_STRING, &cli->plugins, N_("List of plugins separated by ','"), N_("plugin1,plugin2") },
@@ -503,21 +503,21 @@ read_config (GKeyFile *keyfile, const char *path, GError **error)
 
 static gboolean
 read_base_config (GKeyFile *keyfile,
-                  const char *cli_config_path,
-                  char **out_config_path,
+                  const char *cli_config_main_file,
+                  char **out_config_main_file,
                   GError **error)
 {
 	GError *my_error = NULL;
 
 	g_return_val_if_fail (keyfile, FALSE);
-	g_return_val_if_fail (out_config_path && !*out_config_path, FALSE);
+	g_return_val_if_fail (out_config_main_file && !*out_config_main_file, FALSE);
 	g_return_val_if_fail (!error || !*error, FALSE);
 
 	/* Try a user-specified config file first */
-	if (cli_config_path) {
+	if (cli_config_main_file) {
 		/* Bad user-specific config file path is a hard error */
-		if (read_config (keyfile, cli_config_path, error)) {
-			*out_config_path = g_strdup (cli_config_path);
+		if (read_config (keyfile, cli_config_main_file, error)) {
+			*out_config_main_file = g_strdup (cli_config_main_file);
 			return TRUE;
 		} else
 			return FALSE;
@@ -532,7 +532,7 @@ read_base_config (GKeyFile *keyfile,
 
 	/* Try deprecated nm-system-settings.conf first */
 	if (read_config (keyfile, NM_OLD_SYSTEM_CONF_FILE, &my_error)) {
-		*out_config_path = g_strdup (NM_OLD_SYSTEM_CONF_FILE);
+		*out_config_main_file = g_strdup (NM_OLD_SYSTEM_CONF_FILE);
 		return TRUE;
 	}
 
@@ -545,7 +545,7 @@ read_base_config (GKeyFile *keyfile,
 
 	/* Try the standard config file location next */
 	if (read_config (keyfile, NM_DEFAULT_SYSTEM_CONF_FILE, &my_error)) {
-		*out_config_path = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
+		*out_config_main_file = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
 		return TRUE;
 	}
 
@@ -561,7 +561,7 @@ read_base_config (GKeyFile *keyfile,
 	/* If for some reason no config file exists, use the default
 	 * config file path.
 	 */
-	*out_config_path = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
+	*out_config_main_file = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
 	nm_log_info (LOGD_CORE, "No config file found or given; using %s\n",
 	             NM_DEFAULT_SYSTEM_CONF_FILE);
 	return TRUE;
@@ -687,13 +687,13 @@ nm_config_new (const NMConfigCmdLineOptions *cli, GError **error)
 		priv->config_dir = g_strdup (NM_DEFAULT_SYSTEM_CONF_DIR);
 
 	/* First read the base config file */
-	if (!read_base_config (priv->keyfile, priv->cli.config_path, &priv->nm_conf_path, error)) {
+	if (!read_base_config (priv->keyfile, priv->cli.config_main_file, &priv->config_main_file, error)) {
 		g_object_unref (self);
 		return NULL;
 	}
 
 	confs = g_ptr_array_new_with_free_func (g_free);
-	config_description = g_string_new (priv->nm_conf_path);
+	config_description = g_string_new (priv->config_main_file);
 	dir = g_file_new_for_path (priv->config_dir);
 	direnum = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, NULL);
 	if (direnum) {
@@ -797,7 +797,7 @@ finalize (GObject *gobject)
 {
 	NMConfigPrivate *priv = NM_CONFIG_GET_PRIVATE (gobject);
 
-	g_free (priv->nm_conf_path);
+	g_free (priv->config_main_file);
 	g_free (priv->config_dir);
 	g_free (priv->config_description);
 	g_free (priv->no_auto_default_file);
diff --git a/src/nm-config.h b/src/nm-config.h
index 8e8bca3406..14ae511633 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -61,8 +61,8 @@ NMConfig *nm_config_get (void);
 
 NMConfigData *nm_config_get_data (NMConfig *config);
 NMConfigData *nm_config_get_data_orig (NMConfig *config);
-const char *nm_config_get_path (NMConfig *config);
-const char *nm_config_get_description (NMConfig *config);
+const char *nm_config_get_config_main_file (NMConfig *config);
+const char *nm_config_get_config_description (NMConfig *config);
 const char **nm_config_get_plugins (NMConfig *config);
 gboolean nm_config_get_monitor_connection_files (NMConfig *config);
 gboolean nm_config_get_auth_polkit (NMConfig *config);
diff --git a/src/settings/plugins/example/plugin.c b/src/settings/plugins/example/plugin.c
index 9945e13b56..b93b1dfb46 100644
--- a/src/settings/plugins/example/plugin.c
+++ b/src/settings/plugins/example/plugin.c
@@ -847,7 +847,7 @@ nm_system_config_factory (void)
 		priv = SC_PLUGIN_EXAMPLE_GET_PRIVATE (singleton);
 
 		/* Cache the config file path */
-		priv->conf_file = nm_config_get_path (nm_config_get ());
+		priv->conf_file = nm_config_get_config_main_file (nm_config_get ());
 	} else {
 		/* This function should never be called twice */
 		g_assert_not_reached ();
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index 1b5642afb4..61b9dcef07 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -461,7 +461,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
 	                             &error);
 	if (error) {
 		nm_log_info (LOGD_SETTINGS, "loading system config file (%s) caused error: %s",
-		             nm_config_get_path (nm_config_get ()),
+		             nm_config_get_config_main_file (nm_config_get ()),
 		             error->message);
 	} else {
 		gboolean manage_well_known;
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index fcdb3c3cf0..869af6a1c5 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -843,7 +843,7 @@ nm_settings_keyfile_plugin_new (void)
 		singleton = SC_PLUGIN_KEYFILE (g_object_new (SC_TYPE_PLUGIN_KEYFILE, NULL));
 		priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (singleton);
 
-		priv->conf_file = nm_config_get_path (nm_config_get ());
+		priv->conf_file = nm_config_get_config_main_file (nm_config_get ());
 
 		/* plugin_set_hostname() has to be called *after* priv->conf_file is set */
 		priv->hostname = plugin_get_hostname (singleton);
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index 827fde1841..55bf2730b1 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -97,7 +97,7 @@ test_config_simple (void)
 
 	config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "/no/such/dir", NULL);
 
-	g_assert_cmpstr (nm_config_get_path (config), ==, SRCDIR "/NetworkManager.conf");
+	g_assert_cmpstr (nm_config_get_config_main_file (config), ==, SRCDIR "/NetworkManager.conf");
 	g_assert_cmpstr (nm_config_get_dhcp_client (config), ==, "dhclient");
 	g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
 	g_assert_cmpint (nm_config_data_get_connectivity_interval (nm_config_get_data_orig (config)), ==, 100);
@@ -156,7 +156,7 @@ test_config_override (void)
 	                       "--connectivity-interval", "12",
 	                       NULL);
 
-	g_assert_cmpstr (nm_config_get_path (config), ==, SRCDIR "/NetworkManager.conf");
+	g_assert_cmpstr (nm_config_get_config_main_file (config), ==, SRCDIR "/NetworkManager.conf");
 	g_assert_cmpstr (nm_config_get_dhcp_client (config), ==, "dhclient");
 	g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
 	g_assert_cmpint (nm_config_data_get_connectivity_interval (nm_config_get_data_orig (config)), ==, 12);
@@ -237,7 +237,7 @@ test_config_confdir (void)
 
 	config = setup_config (NULL, SRCDIR "/NetworkManager.conf", SRCDIR "/conf.d", NULL);
 
-	g_assert_cmpstr (nm_config_get_path (config), ==, SRCDIR "/NetworkManager.conf");
+	g_assert_cmpstr (nm_config_get_config_main_file (config), ==, SRCDIR "/NetworkManager.conf");
 	g_assert_cmpstr (nm_config_get_dhcp_client (config), ==, "dhcpcd");
 	g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
 	g_assert_cmpstr (nm_config_get_log_domains (config), ==, "PLATFORM,DNS,WIFI");