diff --git a/Makefile.am b/Makefile.am
index 02de986c9f..d960462126 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2569,8 +2569,8 @@ src_core_libNetworkManager_la_SOURCES = \
 	src/core/nm-dhcp-config.h \
 	src/core/nm-dispatcher.c \
 	src/core/nm-dispatcher.h \
-	src/core/nm-firewall-manager.c \
-	src/core/nm-firewall-manager.h \
+	src/core/nm-firewalld-manager.c \
+	src/core/nm-firewalld-manager.h \
 	src/core/nm-proxy-config.c \
 	src/core/nm-proxy-config.h \
 	src/core/nm-auth-manager.c \
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 62226718f1..1ff8d39eb6 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -52,7 +52,7 @@
 #include "dnsmasq/nm-dnsmasq-manager.h"
 #include "nm-dhcp-config.h"
 #include "nm-rfkill-manager.h"
-#include "nm-firewall-manager.h"
+#include "nm-firewalld-manager.h"
 #include "settings/nm-settings-connection.h"
 #include "settings/nm-settings.h"
 #include "nm-setting-ethtool.h"
diff --git a/src/core/meson.build b/src/core/meson.build
index ef97f3822d..da85b06dbc 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -163,7 +163,7 @@ libNetworkManager = static_library(
     'nm-dcb.c',
     'nm-dhcp-config.c',
     'nm-dispatcher.c',
-    'nm-firewall-manager.c',
+    'nm-firewalld-manager.c',
     'nm-hostname-manager.c',
     'nm-keep-alive.c',
     'nm-manager.c',
diff --git a/src/core/nm-firewall-manager.c b/src/core/nm-firewalld-manager.c
similarity index 99%
rename from src/core/nm-firewall-manager.c
rename to src/core/nm-firewalld-manager.c
index 0db6fb4bbc..5a018728e8 100644
--- a/src/core/nm-firewall-manager.c
+++ b/src/core/nm-firewalld-manager.c
@@ -5,7 +5,7 @@
 
 #include "src/core/nm-default-daemon.h"
 
-#include "nm-firewall-manager.h"
+#include "nm-firewalld-manager.h"
 
 #include "libnm-glib-aux/nm-dbus-aux.h"
 #include "c-list/src/c-list.h"
diff --git a/src/core/nm-firewall-manager.h b/src/core/nm-firewalld-manager.h
similarity index 100%
rename from src/core/nm-firewall-manager.h
rename to src/core/nm-firewalld-manager.h
diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
index 52d9b34e0c..ccd00e1ad5 100644
--- a/src/core/nm-policy.c
+++ b/src/core/nm-policy.c
@@ -21,7 +21,7 @@
 #include "dns/nm-dns-manager.h"
 #include "vpn/nm-vpn-manager.h"
 #include "nm-auth-utils.h"
-#include "nm-firewall-manager.h"
+#include "nm-firewalld-manager.h"
 #include "nm-dispatcher.h"
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index 2dbbae9105..4618694576 100644
--- a/src/core/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
@@ -29,7 +29,7 @@
 #include "settings/nm-agent-manager.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-pacrunner-manager.h"
-#include "nm-firewall-manager.h"
+#include "nm-firewalld-manager.h"
 #include "nm-config.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-manager.h"