diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index f0d497306..539b8a2fe 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -24,18 +24,18 @@ noinst_LTLIBRARIES = \
 ###############################################################################
 
 libnms_ifupdown_core_la_SOURCES = \
-	interface_parser.c \
-	interface_parser.h \
-	parser.c \
-	parser.h
+	nms-ifupdown-interface-parser.c \
+	nms-ifupdown-interface-parser.h \
+	nms-ifupdown-parser.c \
+	nms-ifupdown-parser.h
 
 ###############################################################################
 
 libnm_settings_plugin_ifupdown_la_SOURCES = \
-	nm-ifupdown-connection.c \
-	nm-ifupdown-connection.h \
-	plugin.c \
-	plugin.h
+	nms-ifupdown-connection.c \
+	nms-ifupdown-connection.h \
+	nms-ifupdown-plugin.c \
+	nms-ifupdown-plugin.h
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 	-module -avoid-version
diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
similarity index 97%
rename from src/settings/plugins/ifupdown/nm-ifupdown-connection.c
rename to src/settings/plugins/ifupdown/nms-ifupdown-connection.c
index 15d30079d..1c3333bdd 100644
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
@@ -22,7 +22,7 @@
 
 #include "nm-default.h"
 
-#include "nm-ifupdown-connection.h"
+#include "nms-ifupdown-connection.h"
 
 #include <string.h>
 #include <glib/gstdio.h>
@@ -32,7 +32,8 @@
 #include "nm-setting-wireless-security.h"
 #include "nm-settings-connection.h"
 #include "nm-settings-plugin.h"
-#include "parser.h"
+
+#include "nms-ifupdown-parser.h"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nms-ifupdown-connection.h
similarity index 97%
rename from src/settings/plugins/ifupdown/nm-ifupdown-connection.h
rename to src/settings/plugins/ifupdown/nms-ifupdown-connection.h
index f710b1b6f..107cd6969 100644
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-connection.h
@@ -26,7 +26,7 @@
 
 #include <nm-settings-connection.h>
 
-#include "interface_parser.h"
+#include "nms-ifupdown-interface-parser.h"
 
 #define NM_TYPE_IFUPDOWN_CONNECTION            (nm_ifupdown_connection_get_type ())
 #define NM_IFUPDOWN_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnection))
diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
similarity index 99%
rename from src/settings/plugins/ifupdown/interface_parser.c
rename to src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index 764ba5c93..df6d248c0 100644
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -22,7 +22,7 @@
 
 #include "nm-default.h"
 
-#include "interface_parser.h"
+#include "nms-ifupdown-interface-parser.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
similarity index 100%
rename from src/settings/plugins/ifupdown/interface_parser.h
rename to src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
similarity index 99%
rename from src/settings/plugins/ifupdown/parser.c
rename to src/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 109018dd2..00d56508c 100644
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
@@ -23,6 +23,8 @@
 
 #include "nm-default.h"
 
+#include "nms-ifupdown-parser.h"
+
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -32,14 +34,10 @@
 #include "nm-core-internal.h"
 #include "nm-settings-plugin.h"
 
-#include "parser.h"
-#include "plugin.h"
+#include "nms-ifupdown-plugin.h"
+#include "nms-ifupdown-parser.h"
 
 
-#define WPA_PMK_LEN 32
-
-#include "parser.h"
-
 static const gchar*
 _ifupdownplugin_guess_connection_type (if_block *block)
 {
diff --git a/src/settings/plugins/ifupdown/parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
similarity index 96%
rename from src/settings/plugins/ifupdown/parser.h
rename to src/settings/plugins/ifupdown/nms-ifupdown-parser.h
index 549f1ad3f..36e52e2cb 100644
--- a/src/settings/plugins/ifupdown/parser.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
@@ -25,7 +25,8 @@
 #define __PARSER_H__
 
 #include <nm-connection.h>
-#include "interface_parser.h"
+
+#include "nms-ifupdown-interface-parser.h"
 
 gboolean
 ifupdown_update_connection_from_if_block (NMConnection *connection,
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
similarity index 99%
rename from src/settings/plugins/ifupdown/plugin.c
rename to src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index abb9af146..35ae88e9f 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -24,7 +24,7 @@
 
 #include "nm-default.h"
 
-#include "plugin.h"
+#include "nms-ifupdown-plugin.h"
 
 #include <string.h>
 #include <arpa/inet.h>
@@ -43,9 +43,9 @@
 #include "NetworkManagerUtils.h"
 #include "nm-config.h"
 
-#include "interface_parser.h"
-#include "nm-ifupdown-connection.h"
-#include "parser.h"
+#include "nms-ifupdown-interface-parser.h"
+#include "nms-ifupdown-connection.h"
+#include "nms-ifupdown-parser.h"
 
 #define ENI_INTERFACES_FILE "/etc/network/interfaces"
 
diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
similarity index 100%
rename from src/settings/plugins/ifupdown/plugin.h
rename to src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 11b42c714..eaf7a67f9 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -23,8 +23,9 @@
 #include <string.h>
 
 #include "nm-core-internal.h"
-#include "interface_parser.h"
-#include "parser.h"
+
+#include "nms-ifupdown-interface-parser.h"
+#include "nms-ifupdown-parser.h"
 
 #include "nm-test-utils-core.h"