wifi-p2p: rename files for consistent Wi-Fi P2P naming

We named the types inconsistently:

  - "p2p-wireless" ("libnm-core/nm-setting-p2p-wireless.h")

  - "p2p" ("libnm/nm-p2p-peer.h")

  - "p2p-wifi" ("src/devices/wifi/nm-device-p2p-wifi.h")

It seems to me, "libnm/nm-p2p-peer.h" should be qualified with a "Wi-Fi"
specific name. It's not just peer-to-peer, it's Wi-Fi P2P.
Yes, there is an inconsistency now, because there is already
"libnm/nm-access-point.h".

It seems to me (from looking at the internet), that the name "Wi-Fi P2P"
is more common than "P2P Wi-Fi" -- although both are used. There is also
the name "Wi-Fi Direct". But it's not clear which name should be
preferred here, so stick to "Wi-Fi P2P".

In this first commit only rename the files. The following commit will
rename the content.

21 files changed, 64 insertions, 64 deletions

diff --git a/Makefile.am b/Makefile.am
index 7a75a6637f..8a03f1993f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -653,7 +653,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-ovs-interface.h \
 	libnm-core/nm-setting-ovs-patch.h \
 	libnm-core/nm-setting-ovs-port.h \
-	libnm-core/nm-setting-p2p-wireless.h \
 	libnm-core/nm-setting-ppp.h \
 	libnm-core/nm-setting-pppoe.h \
 	libnm-core/nm-setting-proxy.h \
@@ -667,6 +666,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-vlan.h \
 	libnm-core/nm-setting-vpn.h \
 	libnm-core/nm-setting-vxlan.h \
+	libnm-core/nm-setting-wifi-p2p.h \
 	libnm-core/nm-setting-wimax.h \
 	libnm-core/nm-setting-wired.h \
 	libnm-core/nm-setting-wireless-security.h \
@@ -722,7 +722,6 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-ovs-interface.c \
 	libnm-core/nm-setting-ovs-patch.c \
 	libnm-core/nm-setting-ovs-port.c \
-	libnm-core/nm-setting-p2p-wireless.c \
 	libnm-core/nm-setting-ppp.c \
 	libnm-core/nm-setting-pppoe.c \
 	libnm-core/nm-setting-proxy.c \
@@ -736,6 +735,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-vlan.c \
 	libnm-core/nm-setting-vpn.c \
 	libnm-core/nm-setting-vxlan.c \
+	libnm-core/nm-setting-wifi-p2p.c \
 	libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
 	libnm-core/nm-setting-wireless-security.c \
@@ -1041,15 +1041,15 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-macvlan.h \
 	libnm/nm-device-modem.h \
 	libnm/nm-device-olpc-mesh.h \
+	libnm/nm-device-ovs-bridge.h \
 	libnm/nm-device-ovs-interface.h \
 	libnm/nm-device-ovs-port.h \
-	libnm/nm-device-ovs-bridge.h \
-	libnm/nm-device-p2p-wifi.h \
 	libnm/nm-device-ppp.h \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
 	libnm/nm-device-vlan.h \
 	libnm/nm-device-vxlan.h \
+	libnm/nm-device-wifi-p2p.h \
 	libnm/nm-device-wifi.h \
 	libnm/nm-device-wimax.h \
 	libnm/nm-device-wireguard.h \
@@ -1058,7 +1058,6 @@ libnm_lib_h_pub_real = \
 	libnm/nm-dhcp-config.h \
 	libnm/nm-ip-config.h \
 	libnm/nm-object.h \
-	libnm/nm-p2p-peer.h \
 	libnm/nm-remote-connection.h \
 	libnm/nm-secret-agent-old.h \
 	libnm/nm-types.h \
@@ -1066,6 +1065,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-vpn-editor.h \
 	libnm/nm-vpn-plugin-old.h \
 	libnm/nm-vpn-service-plugin.h \
+	libnm/nm-wifi-p2p-peer.h \
 	libnm/nm-wimax-nsp.h
 libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
@@ -1102,15 +1102,15 @@ libnm_lib_c_real = \
 	libnm/nm-device-macvlan.c \
 	libnm/nm-device-modem.c \
 	libnm/nm-device-olpc-mesh.c \
+	libnm/nm-device-ovs-bridge.c \
 	libnm/nm-device-ovs-interface.c \
 	libnm/nm-device-ovs-port.c \
-	libnm/nm-device-ovs-bridge.c \
-	libnm/nm-device-p2p-wifi.c \
 	libnm/nm-device-ppp.c \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
 	libnm/nm-device-vlan.c \
 	libnm/nm-device-vxlan.c \
+	libnm/nm-device-wifi-p2p.c \
 	libnm/nm-device-wifi.c \
 	libnm/nm-device-wimax.c \
 	libnm/nm-device-wireguard.c \
@@ -1125,14 +1125,14 @@ libnm_lib_c_real = \
 	libnm/nm-ip6-config.c \
 	libnm/nm-manager.c \
 	libnm/nm-object.c \
-	libnm/nm-p2p-peer.c \
 	libnm/nm-remote-connection.c \
 	libnm/nm-remote-settings.c \
 	libnm/nm-secret-agent-old.c \
 	libnm/nm-vpn-connection.c \
-	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-editor.c \
+	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-service-plugin.c \
+	libnm/nm-wifi-p2p-peer.c \
 	libnm/nm-wimax-nsp.c
 libnm_lib_c_mkenums = \
 	libnm/nm-enum-types.c
@@ -3256,8 +3256,8 @@ core_plugins += src/devices/wifi/libnm-device-plugin-wifi.la
 src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
 	src/devices/wifi/nm-device-olpc-mesh.c \
 	src/devices/wifi/nm-device-olpc-mesh.h \
-	src/devices/wifi/nm-device-p2p-wifi.c \
-	src/devices/wifi/nm-device-p2p-wifi.h \
+	src/devices/wifi/nm-device-wifi-p2p.c \
+	src/devices/wifi/nm-device-wifi-p2p.h \
 	src/devices/wifi/nm-device-wifi.c \
 	src/devices/wifi/nm-device-wifi.h \
 	src/devices/wifi/nm-wifi-ap.c \
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 03f6835737..2a7b76bf34 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -218,9 +218,8 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-ovs-interface.xml"/>
     <xi:include href="xml/nm-setting-ovs-patch.xml"/>
     <xi:include href="xml/nm-setting-ovs-port.xml"/>
-    <xi:include href="xml/nm-setting-p2p-wireless.xml"/>
-    <xi:include href="xml/nm-setting-pppoe.xml"/>
     <xi:include href="xml/nm-setting-ppp.xml"/>
+    <xi:include href="xml/nm-setting-pppoe.xml"/>
     <xi:include href="xml/nm-setting-proxy.xml"/>
     <xi:include href="xml/nm-setting-serial.xml"/>
     <xi:include href="xml/nm-setting-sriov.xml"/>
@@ -232,6 +231,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-vlan.xml"/>
     <xi:include href="xml/nm-setting-vpn.xml"/>
     <xi:include href="xml/nm-setting-vxlan.xml"/>
+    <xi:include href="xml/nm-setting-wifi-p2p.xml"/>
     <xi:include href="xml/nm-setting-wimax.xml"/>
     <xi:include href="xml/nm-setting-wired.xml"/>
     <xi:include href="xml/nm-setting-wireless-security.xml"/>
@@ -261,12 +261,12 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-device-ovs-bridge.xml"/>
     <xi:include href="xml/nm-device-ovs-interface.xml"/>
     <xi:include href="xml/nm-device-ovs-port.xml"/>
-    <xi:include href="xml/nm-device-p2p-wifi.xml"/>
     <xi:include href="xml/nm-device-ppp.xml"/>
     <xi:include href="xml/nm-device-team.xml"/>
     <xi:include href="xml/nm-device-tun.xml"/>
     <xi:include href="xml/nm-device-vlan.xml"/>
     <xi:include href="xml/nm-device-vxlan.xml"/>
+    <xi:include href="xml/nm-device-wifi-p2p.xml"/>
     <xi:include href="xml/nm-device-wifi.xml"/>
     <xi:include href="xml/nm-device-wimax.xml"/>
     <xi:include href="xml/nm-device-wireguard.xml"/>
@@ -275,7 +275,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-active-connection.xml"/>
     <xi:include href="xml/nm-vpn-connection.xml"/>
     <xi:include href="xml/nm-access-point.xml"/>
-    <xi:include href="xml/nm-p2p-peer.xml"/>
+    <xi:include href="xml/nm-wifi-p2p-peer.xml"/>
     <xi:include href="xml/nm-wimax-nsp.xml"/>
     <xi:include href="xml/nm-ip-config.xml"/>
     <xi:include href="xml/nm-dhcp-config.xml"/>
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index e615b3451e..89b8746e39 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -32,7 +32,6 @@ libnm_core_headers = files(
   'nm-setting-ovs-interface.h',
   'nm-setting-ovs-patch.h',
   'nm-setting-ovs-port.h',
-  'nm-setting-p2p-wireless.h',
   'nm-setting-ppp.h',
   'nm-setting-pppoe.h',
   'nm-setting-proxy.h',
@@ -46,6 +45,7 @@ libnm_core_headers = files(
   'nm-setting-vlan.h',
   'nm-setting-vpn.h',
   'nm-setting-vxlan.h',
+  'nm-setting-wifi-p2p.h',
   'nm-setting-wimax.h',
   'nm-setting-wired.h',
   'nm-setting-wireless-security.h',
@@ -88,7 +88,6 @@ libnm_core_settings_sources = files(
   'nm-setting-ovs-interface.c',
   'nm-setting-ovs-patch.c',
   'nm-setting-ovs-port.c',
-  'nm-setting-p2p-wireless.c',
   'nm-setting-ppp.c',
   'nm-setting-pppoe.c',
   'nm-setting-proxy.c',
@@ -102,6 +101,7 @@ libnm_core_settings_sources = files(
   'nm-setting-vlan.c',
   'nm-setting-vpn.c',
   'nm-setting-vxlan.c',
+  'nm-setting-wifi-p2p.c',
   'nm-setting-wimax.c',
   'nm-setting-wired.c',
   'nm-setting-wireless-security.c',
diff --git a/libnm-core/nm-core-enum-types.c.template b/libnm-core/nm-core-enum-types.c.template
index 0edb97dcc7..2cef0307a1 100644
--- a/libnm-core/nm-core-enum-types.c.template
+++ b/libnm-core/nm-core-enum-types.c.template
@@ -4,7 +4,6 @@
 #include "nm-core-enum-types.h"
 #include "nm-default.h"
 
-#include "nm-version-macros.h"
 #include "nm-connection.h"
 #include "nm-core-types.h"
 #include "nm-dbus-interface.h"
@@ -33,7 +32,6 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
-#include "nm-setting-p2p-wireless.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
@@ -45,6 +43,7 @@
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-vxlan.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless-security.h"
@@ -53,6 +52,7 @@
 #include "nm-setting.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
+#include "nm-version-macros.h"
 #include "nm-version.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-editor-plugin.h"
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f73d728b7d..b3d664dcea 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -37,6 +37,8 @@
 
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
+#include "nm-core-types-internal.h"
+#include "nm-meta-setting.h"
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
@@ -52,7 +54,6 @@
 #include "nm-setting-gsm.h"
 #include "nm-setting-infiniband.h"
 #include "nm-setting-ip-tunnel.h"
-#include "nm-setting-proxy.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-macsec.h"
@@ -63,9 +64,9 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
-#include "nm-setting-p2p-wireless.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
+#include "nm-setting-proxy.h"
 #include "nm-setting-serial.h"
 #include "nm-setting-sriov.h"
 #include "nm-setting-tc-config.h"
@@ -75,6 +76,7 @@
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-vxlan.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless-security.h"
@@ -84,9 +86,7 @@
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
 #include "nm-vpn-dbus-interface.h"
-#include "nm-core-types-internal.h"
 #include "nm-vpn-editor-plugin.h"
-#include "nm-meta-setting.h"
 
 /* IEEE 802.1D-1998 timer values */
 #define NM_BR_MIN_HELLO_TIME    1
diff --git a/libnm-core/nm-setting-p2p-wireless.c b/libnm-core/nm-setting-wifi-p2p.c
index 8188cab5d2..4c679a99d6 100644
--- a/libnm-core/nm-setting-p2p-wireless.c
+++ b/libnm-core/nm-setting-wifi-p2p.c
@@ -19,7 +19,7 @@
 
 #include "nm-default.h"
 
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 
 #include <string.h>
 #include <net/ethernet.h>
@@ -30,7 +30,7 @@
 #include "nm-setting-private.h"
 
 /**
- * SECTION:nm-setting-p2p-wireless
+ * SECTION:nm-setting-wifi-p2p
  * @short_description: Describes connection properties for 802.11 Wi-Fi P2P networks
  *
  * The #NMSettingP2PWireless object is a #NMSetting subclass that describes properties
diff --git a/libnm-core/nm-setting-p2p-wireless.h b/libnm-core/nm-setting-wifi-p2p.h
index 09ac934e31..09ac934e31 100644
--- a/libnm-core/nm-setting-p2p-wireless.h
+++ b/libnm-core/nm-setting-wifi-p2p.h
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 1f98e50b11..1e59d11758 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -43,15 +43,15 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
-#include "nm-device-p2p-wifi.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
@@ -61,7 +61,6 @@
 #include "nm-enum-types.h"
 #include "nm-ip-config.h"
 #include "nm-object.h"
-#include "nm-p2p-peer.h"
 #include "nm-remote-connection.h"
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
@@ -90,7 +89,7 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
@@ -119,6 +118,7 @@
 #include "nm-vpn-editor-plugin.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-service-plugin.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-wimax-nsp.h"
 
 #include "nm-autoptr.h"
diff --git a/libnm/meson.build b/libnm/meson.build
index dee4e36bdf..f538dbfbaf 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -40,30 +40,29 @@ libnm_headers = files(
   'nm-device-dummy.h',
   'nm-device-ethernet.h',
   'nm-device-generic.h',
-  'nm-device.h',
   'nm-device-infiniband.h',
   'nm-device-ip-tunnel.h',
   'nm-device-macsec.h',
   'nm-device-macvlan.h',
   'nm-device-modem.h',
   'nm-device-olpc-mesh.h',
+  'nm-device-ovs-bridge.h',
   'nm-device-ovs-interface.h',
   'nm-device-ovs-port.h',
-  'nm-device-ovs-bridge.h',
-  'nm-device-p2p-wifi.h',
   'nm-device-ppp.h',
   'nm-device-team.h',
   'nm-device-tun.h',
   'nm-device-vlan.h',
   'nm-device-vxlan.h',
+  'nm-device-wifi-p2p.h',
   'nm-device-wifi.h',
   'nm-device-wimax.h',
   'nm-device-wireguard.h',
   'nm-device-wpan.h',
+  'nm-device.h',
   'nm-dhcp-config.h',
   'nm-ip-config.h',
   'nm-object.h',
-  'nm-p2p-peer.h',
   'nm-remote-connection.h',
   'nm-secret-agent-old.h',
   'nm-types.h',
@@ -71,6 +70,7 @@ libnm_headers = files(
   'nm-vpn-editor.h',
   'nm-vpn-plugin-old.h',
   'nm-vpn-service-plugin.h',
+  'nm-wifi-p2p-peer.h',
   'nm-wimax-nsp.h',
 )
 
@@ -103,7 +103,6 @@ libnm_sources = files(
   'nm-device-bond.c',
   'nm-device-bridge.c',
   'nm-device-bt.c',
-  'nm-device.c',
   'nm-device-dummy.c',
   'nm-device-ethernet.c',
   'nm-device-generic.c',
@@ -113,19 +112,20 @@ libnm_sources = files(
   'nm-device-macvlan.c',
   'nm-device-modem.c',
   'nm-device-olpc-mesh.c',
+  'nm-device-ovs-bridge.c',
   'nm-device-ovs-interface.c',
   'nm-device-ovs-port.c',
-  'nm-device-ovs-bridge.c',
-  'nm-device-p2p-wifi.c',
   'nm-device-ppp.c',
   'nm-device-team.c',
   'nm-device-tun.c',
   'nm-device-vlan.c',
   'nm-device-vxlan.c',
+  'nm-device-wifi-p2p.c',
   'nm-device-wifi.c',
   'nm-device-wimax.c',
   'nm-device-wireguard.c',
   'nm-device-wpan.c',
+  'nm-device.c',
   'nm-dhcp-config.c',
   'nm-dhcp4-config.c',
   'nm-dhcp6-config.c',
@@ -135,14 +135,14 @@ libnm_sources = files(
   'nm-ip6-config.c',
   'nm-manager.c',
   'nm-object.c',
-  'nm-p2p-peer.c',
   'nm-remote-connection.c',
   'nm-remote-settings.c',
   'nm-secret-agent-old.c',
   'nm-vpn-connection.c',
-  'nm-vpn-plugin-old.c',
   'nm-vpn-editor.c',
+  'nm-vpn-plugin-old.c',
   'nm-vpn-service-plugin.c',
+  'nm-wifi-p2p-peer.c',
   'nm-wimax-nsp.c',
 )
 
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index e5902ad051..1cb73b73a6 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -66,26 +66,26 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
-#include "nm-device-p2p-wifi.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
 #include "nm-device-wpan.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
-#include "nm-dhcp-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-manager.h"
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-settings.h"
 #include "nm-vpn-connection.h"
diff --git a/libnm/nm-device-p2p-wifi.c b/libnm/nm-device-wifi-p2p.c
index c9be88ff1a..65be8d2aaf 100644
--- a/libnm/nm-device-p2p-wifi.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -19,15 +19,15 @@
 
 #include "nm-default.h"
 
-#include "nm-device-p2p-wifi.h"
+#include "nm-device-wifi-p2p.h"
 
 #include <string.h>
 
 #include "nm-setting-connection.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"
 
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 #include "nm-dbus-helpers.h"
diff --git a/libnm/nm-device-p2p-wifi.h b/libnm/nm-device-wifi-p2p.h
index bd5841fde2..bd5841fde2 100644
--- a/libnm/nm-device-p2p-wifi.h
+++ b/libnm/nm-device-wifi-p2p.h
diff --git a/libnm/nm-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index 164a758e83..5edbef090e 100644
--- a/libnm/nm-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -19,13 +19,13 @@
 
 #include "nm-default.h"
 
-#include "nm-p2p-peer.h"
+#include "nm-wifi-p2p-peer.h"
 
 #include <string.h>
 
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"
 
 #include "nm-dbus-interface.h"
diff --git a/libnm/nm-p2p-peer.h b/libnm/nm-wifi-p2p-peer.h
index 0c52ecb3c0..0c52ecb3c0 100644
--- a/libnm/nm-p2p-peer.h
+++ b/libnm/nm-wifi-p2p-peer.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31a614fc8a..393f84e8ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,29 +72,29 @@ libnm-core/nm-setting-ethtool.c
 libnm-core/nm-setting-gsm.c
 libnm-core/nm-setting-infiniband.c
 libnm-core/nm-setting-ip-config.c
+libnm-core/nm-setting-ip-tunnel.c
 libnm-core/nm-setting-ip4-config.c
 libnm-core/nm-setting-ip6-config.c
-libnm-core/nm-setting-ip-tunnel.c
 libnm-core/nm-setting-macsec.c
 libnm-core/nm-setting-macvlan.c
 libnm-core/nm-setting-olpc-mesh.c
+libnm-core/nm-setting-ovs-bridge.c
 libnm-core/nm-setting-ovs-interface.c
 libnm-core/nm-setting-ovs-patch.c
 libnm-core/nm-setting-ovs-port.c
-libnm-core/nm-setting-ovs-bridge.c
-libnm-core/nm-setting-p2p-wireless.c
 libnm-core/nm-setting-ppp.c
 libnm-core/nm-setting-pppoe.c
 libnm-core/nm-setting-proxy.c
 libnm-core/nm-setting-sriov.c
 libnm-core/nm-setting-tc-config.c
-libnm-core/nm-setting-team.c
 libnm-core/nm-setting-team-port.c
+libnm-core/nm-setting-team.c
 libnm-core/nm-setting-tun.c
 libnm-core/nm-setting-user.c
 libnm-core/nm-setting-vlan.c
 libnm-core/nm-setting-vpn.c
 libnm-core/nm-setting-vxlan.c
+libnm-core/nm-setting-wifi-p2p.c
 libnm-core/nm-setting-wimax.c
 libnm-core/nm-setting-wired.c
 libnm-core/nm-setting-wireless-security.c
@@ -143,7 +143,6 @@ libnm/nm-device-bt.c
 libnm/nm-device-dummy.c
 libnm/nm-device-ethernet.c
 libnm/nm-device-generic.c
-libnm/nm-device-tun.c
 libnm/nm-device-infiniband.c
 libnm/nm-device-ip-tunnel.c
 libnm/nm-device-macvlan.c
@@ -152,10 +151,11 @@ libnm/nm-device-olpc-mesh.c
 libnm/nm-device-ovs-bridge.c
 libnm/nm-device-ovs-interface.c
 libnm/nm-device-ovs-port.c
-libnm/nm-device-p2p-wifi.c
 libnm/nm-device-team.c
+libnm/nm-device-tun.c
 libnm/nm-device-vlan.c
 libnm/nm-device-vxlan.c
+libnm/nm-device-wifi-p2p.c
 libnm/nm-device-wifi.c
 libnm/nm-device-wimax.c
 libnm/nm-device-wpan.c
diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c
index 6256b06c00..06e24f1a42 100644
--- a/shared/nm-meta-setting.c
+++ b/shared/nm-meta-setting.c
@@ -28,8 +28,8 @@
 #include "nm-setting-adsl.h"
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-bond.h"
-#include "nm-setting-bridge.h"
 #include "nm-setting-bridge-port.h"
+#include "nm-setting-bridge.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-dcb.h"
@@ -38,10 +38,10 @@
 #include "nm-setting-generic.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-infiniband.h"
-#include "nm-setting-ip4-config.h"
-#include "nm-setting-ip6-config.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip-tunnel.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
 #include "nm-setting-macsec.h"
 #include "nm-setting-macvlan.h"
 #include "nm-setting-match.h"
@@ -50,23 +50,23 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
-#include "nm-setting-p2p-wireless.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
 #include "nm-setting-serial.h"
 #include "nm-setting-tc-config.h"
-#include "nm-setting-team.h"
 #include "nm-setting-team-port.h"
+#include "nm-setting-team.h"
 #include "nm-setting-tun.h"
 #include "nm-setting-user.h"
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-vxlan.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
-#include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
+#include "nm-setting-wireless.h"
 #include "nm-setting-wpan.h"
 
 /*****************************************************************************/
diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build
index d2b807fc95..4dfbe4c8da 100644
--- a/src/devices/wifi/meson.build
+++ b/src/devices/wifi/meson.build
@@ -6,7 +6,7 @@ common_sources = files(
 
 sources = common_sources + files(
   'nm-device-olpc-mesh.c',
-  'nm-device-p2p-wifi.c',
+  'nm-device-wifi-p2p.c',
   'nm-device-wifi.c',
   'nm-wifi-common.c',
   'nm-wifi-factory.c',
diff --git a/src/devices/wifi/nm-device-p2p-wifi.c b/src/devices/wifi/nm-device-wifi-p2p.c
index 0b82db4280..8880b5b179 100644
--- a/src/devices/wifi/nm-device-p2p-wifi.c
+++ b/src/devices/wifi/nm-device-wifi-p2p.c
@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include "nm-device-p2p-wifi.h"
+#include "nm-device-wifi-p2p.h"
 
 #include <sys/socket.h>
 
@@ -33,7 +33,7 @@
 #include "NetworkManagerUtils.h"
 #include "devices/nm-device-private.h"
 #include "settings/nm-settings.h"
-#include "nm-setting-p2p-wireless.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "platform/nm-platform.h"
diff --git a/src/devices/wifi/nm-device-p2p-wifi.h b/src/devices/wifi/nm-device-wifi-p2p.h
index b57a3f835b..b57a3f835b 100644
--- a/src/devices/wifi/nm-device-p2p-wifi.h
+++ b/src/devices/wifi/nm-device-wifi-p2p.h
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index cd1b5e6927..4df39b8dc1 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "nm-device-p2p-wifi.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-wifi-ap.h"
 #include "nm-common-macros.h"
 #include "devices/nm-device.h"
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c
index e220c3a4cb..e44169ab52 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/devices/wifi/nm-wifi-factory.c
@@ -26,7 +26,7 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-device-wifi.h"
-#include "nm-device-p2p-wifi.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-olpc-mesh.h"
 #include "nm-device-iwd.h"
 #include "settings/nm-settings-connection.h"