diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 327438d47e..f2a65d9622 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -25,22 +25,22 @@ noinst_LTLIBRARIES = \
 ###############################################################################
 
 libnms_ifnet_core_la_SOURCES = \
-	net_parser.c\
-	net_parser.h\
-	connection_parser.c \
-	connection_parser.h \
-	net_utils.h\
-	net_utils.c\
-	wpa_parser.h\
-	wpa_parser.c
+	nms-ifnet-net-parser.c\
+	nms-ifnet-net-parser.h\
+	nms-ifnet-connection-parser.c \
+	nms-ifnet-connection-parser.h \
+	nms-ifnet-net-utils.h\
+	nms-ifnet-net-utils.c\
+	nms-ifnet-wpa-parser.h\
+	nms-ifnet-wpa-parser.c
 
 ###############################################################################
 
 libnm_settings_plugin_ifnet_la_SOURCES = \
-	nm-ifnet-connection.c \
-	nm-ifnet-connection.h \
-	plugin.c \
-	plugin.h
+	nms-ifnet-connection.c \
+	nms-ifnet-connection.h \
+	nms-ifnet-plugin.c \
+	nms-ifnet-plugin.h
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = \
 	-module -avoid-version
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
similarity index 99%
rename from src/settings/plugins/ifnet/connection_parser.c
rename to src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
index 9917463f98..f336c1ccea 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
@@ -21,6 +21,8 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-connection-parser.h"
+
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -30,10 +32,9 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
-#include "nm-ifnet-connection.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection.h"
 
 static char *
 connection_id_from_ifnet_name (const char *conn_name)
diff --git a/src/settings/plugins/ifnet/connection_parser.h b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
similarity index 98%
rename from src/settings/plugins/ifnet/connection_parser.h
rename to src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
index 74213669de..e6c0e88c81 100644
--- a/src/settings/plugins/ifnet/connection_parser.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
@@ -21,8 +21,10 @@
 
 #ifndef _CONNECTION_PARSER_H
 #define _CONNECTION_PARSER_H
+
 #include <nm-connection.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 gboolean ifnet_can_write_connection (NMConnection *connection, GError **error);
 
diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nms-ifnet-connection.c
similarity index 97%
rename from src/settings/plugins/ifnet/nm-ifnet-connection.c
rename to src/settings/plugins/ifnet/nms-ifnet-connection.c
index 66a2f84893..bea5d11287 100644
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection.c
@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "nm-ifnet-connection.h"
+#include "nms-ifnet-connection.h"
 
 #include <string.h>
 #include <glib/gstdio.h>
@@ -32,11 +32,11 @@
 #include "nm-settings-connection.h"
 #include "nm-settings-plugin.h"
 
-#include "connection_parser.h"
-#include "net_parser.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "plugin.h"
+#include "nms-ifnet-connection-parser.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-plugin.h"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.h b/src/settings/plugins/ifnet/nms-ifnet-connection.h
similarity index 98%
rename from src/settings/plugins/ifnet/nm-ifnet-connection.h
rename to src/settings/plugins/ifnet/nms-ifnet-connection.h
index 490ba1f7a4..1718dcb93e 100644
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection.h
@@ -23,7 +23,8 @@
 #define __NETWORKMANAGER_IFNET_CONNECTION_H__
 
 #include <nm-settings-connection.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 #define NM_TYPE_IFNET_CONNECTION            (nm_ifnet_connection_get_type ())
 #define NM_IFNET_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFNET_CONNECTION, NMIfnetConnection))
diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/nms-ifnet-net-parser.c
similarity index 99%
rename from src/settings/plugins/ifnet/net_parser.c
rename to src/settings/plugins/ifnet/nms-ifnet-net-parser.c
index db5e7a13e7..e4b0ad6ba8 100644
--- a/src/settings/plugins/ifnet/net_parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-parser.c
@@ -21,18 +21,18 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-net-parser.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "nm-settings-plugin.h"
-
-#include "plugin.h"
 #include "nm-platform.h"
 
-#include "net_parser.h"
-#include "net_utils.h"
+#include "nms-ifnet-plugin.h"
+#include "nms-ifnet-net-utils.h"
 
 /* Save all the connection information */
 static GHashTable *conn_table;
diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/nms-ifnet-net-parser.h
similarity index 100%
rename from src/settings/plugins/ifnet/net_parser.h
rename to src/settings/plugins/ifnet/nms-ifnet-net-parser.h
diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/nms-ifnet-net-utils.c
similarity index 99%
rename from src/settings/plugins/ifnet/net_utils.c
rename to src/settings/plugins/ifnet/nms-ifnet-net-utils.c
index bd5d65d578..deb8cef3b2 100644
--- a/src/settings/plugins/ifnet/net_utils.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-utils.c
@@ -21,6 +21,8 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-net-utils.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,9 +32,9 @@
 #include "NetworkManagerUtils.h"
 #include "nm-settings-plugin.h"
 #include "nm-config.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "net_parser.h"
+
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-net-parser.h"
 
 /* emit heading and tailing blank space, tab, character t */
 gchar *
diff --git a/src/settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/nms-ifnet-net-utils.h
similarity index 98%
rename from src/settings/plugins/ifnet/net_utils.h
rename to src/settings/plugins/ifnet/nms-ifnet-net-utils.h
index 85a5cb1ca2..79d4464256 100644
--- a/src/settings/plugins/ifnet/net_utils.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-utils.h
@@ -28,7 +28,8 @@
 
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-ip4-config.h>
-#include "net_parser.h"
+
+#include "nms-ifnet-net-parser.h"
 
 #define has_default_ip4_route(conn_name) has_default_route((conn_name), &is_ip4_address)
 #define has_default_ip6_route(conn_name) has_default_route((conn_name), &is_ip6_address)
diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/nms-ifnet-plugin.c
similarity index 98%
rename from src/settings/plugins/ifnet/plugin.c
rename to src/settings/plugins/ifnet/nms-ifnet-plugin.c
index f7688585a6..4835e3a554 100644
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-plugin.c
@@ -22,7 +22,7 @@
 
 #include "nm-default.h"
 
-#include "plugin.h"
+#include "nms-ifnet-plugin.h"
 
 #include <string.h>
 #include <gmodule.h>
@@ -34,11 +34,11 @@
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
 
-#include "nm-ifnet-connection.h"
-#include "net_utils.h"
-#include "net_parser.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
+#include "nms-ifnet-connection.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection-parser.h"
 
 #define IFNET_PLUGIN_NAME_PRINT "ifnet"
 #define IFNET_PLUGIN_INFO "(C) 1999-2010 Gentoo Foundation, Inc. To report bugs please use bugs.gentoo.org with [networkmanager] or [qiaomuf] prefix."
diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/nms-ifnet-plugin.h
similarity index 100%
rename from src/settings/plugins/ifnet/plugin.h
rename to src/settings/plugins/ifnet/nms-ifnet-plugin.h
diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
similarity index 99%
rename from src/settings/plugins/ifnet/wpa_parser.c
rename to src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
index 505222ab51..1d654d5181 100644
--- a/src/settings/plugins/ifnet/wpa_parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
@@ -21,13 +21,15 @@
 
 #include "nm-default.h"
 
+#include "nms-ifnet-wpa-parser.h"
+
 #include <string.h>
 #include <stdlib.h>
 
 #include "nm-settings-plugin.h"
-#include "wpa_parser.h"
-#include "net_parser.h"
-#include "net_utils.h"
+
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
 
 /* Security information */
 static GHashTable *wsec_table = NULL;
diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h
similarity index 100%
rename from src/settings/plugins/ifnet/wpa_parser.h
rename to src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h
diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c
index 49f88f1c1c..7ab11ba55f 100644
--- a/src/settings/plugins/ifnet/tests/test-ifnet.c
+++ b/src/settings/plugins/ifnet/tests/test-ifnet.c
@@ -30,13 +30,13 @@
 
 #include "nm-utils.h"
 
+#include "nm-config.h"
 #include "nm-linux-platform.h"
 
-#include "net_parser.h"
-#include "net_utils.h"
-#include "wpa_parser.h"
-#include "connection_parser.h"
-#include "nm-config.h"
+#include "nms-ifnet-net-parser.h"
+#include "nms-ifnet-net-utils.h"
+#include "nms-ifnet-wpa-parser.h"
+#include "nms-ifnet-connection-parser.h"
 
 #include "nm-test-utils-core.h"