diff --git a/Tools/msg/px_generate_uorb_compressed_fields.py b/Tools/msg/px_generate_uorb_compressed_fields.py
index f654eef440..7c14fee698 100755
--- a/Tools/msg/px_generate_uorb_compressed_fields.py
+++ b/Tools/msg/px_generate_uorb_compressed_fields.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #############################################################################
 #
-#   Copyright (C) 2023 PX4 Pro Development Team. All rights reserved.
+#   Copyright (C) 2023 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/Tools/msg/px_generate_uorb_topic_files.py b/Tools/msg/px_generate_uorb_topic_files.py
index 56b4ab26d0..e76ae4d381 100755
--- a/Tools/msg/px_generate_uorb_topic_files.py
+++ b/Tools/msg/px_generate_uorb_topic_files.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #############################################################################
 #
-#   Copyright (C) 2013-2022 PX4 Pro Development Team. All rights reserved.
+#   Copyright (C) 2013-2022 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/Tools/msg/px_generate_uorb_topic_helper.py b/Tools/msg/px_generate_uorb_topic_helper.py
index c5a7e221f8..ba767fb18f 100644
--- a/Tools/msg/px_generate_uorb_topic_helper.py
+++ b/Tools/msg/px_generate_uorb_topic_helper.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #############################################################################
 #
-#   Copyright (C) 2013-2022 PX4 Pro Development Team. All rights reserved.
+#   Copyright (C) 2013-2022 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/Tools/zenoh/px_generate_zenoh_topic_files.py b/Tools/zenoh/px_generate_zenoh_topic_files.py
index a50bf67a3b..47cd110f05 100755
--- a/Tools/zenoh/px_generate_zenoh_topic_files.py
+++ b/Tools/zenoh/px_generate_zenoh_topic_files.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #############################################################################
 #
-#   Copyright (C) 2013-2022 PX4 Pro Development Team. All rights reserved.
+#   Copyright (C) 2013-2022 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/docs/assets/airframes/multicopter/amovlab_f410/amovlabf410_drone_v1.15.4.params b/docs/assets/airframes/multicopter/amovlab_f410/amovlabf410_drone_v1.15.4.params
index b8141e2533..30c1d79876 100644
--- a/docs/assets/airframes/multicopter/amovlab_f410/amovlabf410_drone_v1.15.4.params
+++ b/docs/assets/airframes/multicopter/amovlab_f410/amovlabf410_drone_v1.15.4.params
@@ -1,6 +1,6 @@
 # Onboard parameters for Vehicle 1
 #
-# Stack: PX4 Pro
+# Stack: PX4
 # Vehicle: Amovlab F410
 # Version: 1.15.4
 # Git Revision: 99c40407ff000000
diff --git a/docs/assets/airframes/multicopter/omnicopter/omnicopter.params b/docs/assets/airframes/multicopter/omnicopter/omnicopter.params
index 932ca074ad..f8cbf4af8b 100644
--- a/docs/assets/airframes/multicopter/omnicopter/omnicopter.params
+++ b/docs/assets/airframes/multicopter/omnicopter/omnicopter.params
@@ -1,6 +1,6 @@
 # Onboard parameters for Vehicle 1
 #
-# Stack: PX4 Pro
+# Stack: PX4
 # Vehicle: Multi-Rotor
 # Version: 1.13.0 dev
 # Git Revision: dc1db4774f000000
diff --git a/docs/assets/airframes/vtol/foxtech_loong_2160/loong.params b/docs/assets/airframes/vtol/foxtech_loong_2160/loong.params
index 0f0c012b79..5367c645fc 100644
--- a/docs/assets/airframes/vtol/foxtech_loong_2160/loong.params
+++ b/docs/assets/airframes/vtol/foxtech_loong_2160/loong.params
@@ -1,6 +1,6 @@
 # Onboard parameters for Vehicle 1
 #
-# Stack: PX4 Pro
+# Stack: PX4
 # Vehicle: VTOL
 # Version: 1.13.0
 # Git Revision: 89b7373cb202071a
diff --git a/docs/assets/airframes/vtol/omp_hobby_zmo_fpv/omp_hobby_zmo.params b/docs/assets/airframes/vtol/omp_hobby_zmo_fpv/omp_hobby_zmo.params
index b9c930673d..e5eedb7be0 100644
--- a/docs/assets/airframes/vtol/omp_hobby_zmo_fpv/omp_hobby_zmo.params
+++ b/docs/assets/airframes/vtol/omp_hobby_zmo_fpv/omp_hobby_zmo.params
@@ -1,4 +1,4 @@
-# Stack: PX4 Pro
+# Stack: PX4
 # Vehicle: VTOL
 # Vehicle-Id Component-Id Name Value Type
 
diff --git a/docs/en/config/firmware.md b/docs/en/config/firmware.md
index bf9987f279..53444b3bf6 100644
--- a/docs/en/config/firmware.md
+++ b/docs/en/config/firmware.md
@@ -28,7 +28,7 @@ To install PX4:
    Connect directly to a powered USB port on your machine (do not connect through a USB hub).
    :::
 
-1. Select the **PX4 Pro Stable Release vX.x.x** option to install the latest stable version of PX4 _for your flight controller_ (autodetected).
+1. Select the **PX4 Stable Release vX.x.x** option to install the latest stable version of PX4 _for your flight controller_ (autodetected).
 
    ![Install PX4 default](../../assets/qgc/setup/firmware/firmware_connected_default_px4.png)
 
@@ -53,7 +53,7 @@ Next you will need to specify the [vehicle airframe](../config/airframe.md) (and
 
 To install a different version of PX4:
 
-1. Connect the vehicle as above, and select **PX4 Pro Stable Release vX.x.x**.
+1. Connect the vehicle as above, and select **PX4 Stable Release vX.x.x**.
    ![Install PX4 version](../../assets/qgc/setup/firmware/qgc_choose_firmware.png)
 1. Check **Advanced settings** and select the version from the dropdown list:
    - **Standard Version (stable):** The default version (i.e. no need to use advanced settings to install this!)
diff --git a/docs/en/ros/mavros_offboard_cpp.md b/docs/en/ros/mavros_offboard_cpp.md
index 6472670ef8..7fd6f51ad5 100644
--- a/docs/en/ros/mavros_offboard_cpp.md
+++ b/docs/en/ros/mavros_offboard_cpp.md
@@ -24,7 +24,7 @@ Create the `offb_node.cpp` file in your ROS package (by also adding it to your `
 ```cpp
 /**
  * @file offb_node.cpp
- * @brief Offboard control example node, written with MAVROS version 0.19.x, PX4 Pro Flight
+ * @brief Offboard control example node, written with MAVROS version 0.19.x, PX4 Flight
  * Stack and tested in Gazebo Classic SITL
  */
 
@@ -173,7 +173,7 @@ pose.pose.position.y = 0;
 pose.pose.position.z = 2;
 ```
 
-Even though the PX4 Pro Flight Stack operates in the aerospace NED coordinate frame, MAVROS translates these coordinates to the standard ENU frame and vice-versa.
+Even though the PX4 Flight Stack operates in the aerospace NED coordinate frame, MAVROS translates these coordinates to the standard ENU frame and vice-versa.
 This is why we set `z` to positive 2.
 
 ```cpp