diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91ba0bc417..e51cfc5a56 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -172,5 +172,5 @@ src/nm-config.c
 src/nm-iface-helper.c
 src/nm-logging.c
 src/nm-manager.c
-src/settings/plugins/ibft/plugin.c
+src/settings/plugins/ibft/nms-ibft-plugin.c
 src/settings/plugins/ifcfg-rh/reader.c
diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am
index 7a0957f80d..99f9faa9ea 100644
--- a/src/settings/plugins/ibft/Makefile.am
+++ b/src/settings/plugins/ibft/Makefile.am
@@ -7,8 +7,8 @@ pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
 noinst_LTLIBRARIES = libibft-io.la
 
 libibft_io_la_SOURCES = \
-	reader.c \
-	reader.h
+	nms-ibft-reader.c \
+	nms-ibft-reader.h
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/ \
@@ -25,10 +25,10 @@ AM_CPPFLAGS = \
 	-DSBINDIR=\"$(sbindir)\"
 
 libnm_settings_plugin_ibft_la_SOURCES = \
-	plugin.c \
-	plugin.h \
-	nm-ibft-connection.c \
-	nm-ibft-connection.h
+	nms-ibft-plugin.c \
+	nms-ibft-plugin.h \
+	nms-ibft-connection.c \
+	nms-ibft-connection.h
 
 libnm_settings_plugin_ibft_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ibft_la_LIBADD = libibft-io.la
diff --git a/src/settings/plugins/ibft/nm-ibft-connection.c b/src/settings/plugins/ibft/nms-ibft-connection.c
similarity index 97%
rename from src/settings/plugins/ibft/nm-ibft-connection.c
rename to src/settings/plugins/ibft/nms-ibft-connection.c
index 24cfdc19ad..331209b0b3 100644
--- a/src/settings/plugins/ibft/nm-ibft-connection.c
+++ b/src/settings/plugins/ibft/nms-ibft-connection.c
@@ -20,14 +20,14 @@
 
 #include "nm-default.h"
 
-#include "nm-ibft-connection.h"
+#include "nms-ibft-connection.h"
 
 #include <string.h>
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <glib/gstdio.h>
 
-#include "reader.h"
+#include "nms-ibft-reader.h"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/ibft/nm-ibft-connection.h b/src/settings/plugins/ibft/nms-ibft-connection.h
similarity index 100%
rename from src/settings/plugins/ibft/nm-ibft-connection.h
rename to src/settings/plugins/ibft/nms-ibft-connection.h
diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
similarity index 98%
rename from src/settings/plugins/ibft/plugin.c
rename to src/settings/plugins/ibft/nms-ibft-plugin.c
index c663e36110..16ca959163 100644
--- a/src/settings/plugins/ibft/plugin.c
+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include "plugin.h"
+#include "nms-ibft-plugin.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -31,8 +31,8 @@
 #include "nm-settings-plugin.h"
 #include "NetworkManagerUtils.h"
 
-#include "reader.h"
-#include "nm-ibft-connection.h"
+#include "nms-ibft-reader.h"
+#include "nms-ibft-connection.h"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/ibft/plugin.h b/src/settings/plugins/ibft/nms-ibft-plugin.h
similarity index 100%
rename from src/settings/plugins/ibft/plugin.h
rename to src/settings/plugins/ibft/nms-ibft-plugin.h
diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/nms-ibft-reader.c
similarity index 99%
rename from src/settings/plugins/ibft/reader.c
rename to src/settings/plugins/ibft/nms-ibft-reader.c
index c39d875cf9..301d3b2193 100644
--- a/src/settings/plugins/ibft/reader.c
+++ b/src/settings/plugins/ibft/nms-ibft-reader.c
@@ -35,7 +35,7 @@
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
 
-#include "reader.h"
+#include "nms-ibft-reader.h"
 
 #define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, "    " msg)
 
diff --git a/src/settings/plugins/ibft/reader.h b/src/settings/plugins/ibft/nms-ibft-reader.h
similarity index 100%
rename from src/settings/plugins/ibft/reader.h
rename to src/settings/plugins/ibft/nms-ibft-reader.h
diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am
index 2c8df42099..9143b67a8e 100644
--- a/src/settings/plugins/ibft/tests/Makefile.am
+++ b/src/settings/plugins/ibft/tests/Makefile.am
@@ -28,7 +28,7 @@ noinst_PROGRAMS = test-ibft
 
 test_ibft_SOURCES = \
 	test-ibft.c \
-	../reader.c
+	../nms-ibft-reader.c
 
 test_ibft_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la
diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c
index cab468dec9..b4bec0c0ad 100644
--- a/src/settings/plugins/ibft/tests/test-ibft.c
+++ b/src/settings/plugins/ibft/tests/test-ibft.c
@@ -32,7 +32,7 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "reader.h"
+#include "nms-ibft-reader.h"
 
 #include "nm-test-utils-core.h"