diff --git a/docs/server_manual/services/wms.rst b/docs/server_manual/services/wms.rst
index f1970acc0ab..89211885e87 100644
--- a/docs/server_manual/services/wms.rst
+++ b/docs/server_manual/services/wms.rst
@@ -1839,10 +1839,10 @@ Takes a list of key:value pairs separated by semicolon:
 * ``TEXT_RENDER_FORMAT``: sets the text render format for pdf export.
   It can be ``AlwaysOutlines`` (default) or ``AlwaysText``.
 * ``SIMPLIFY_GEOMETRY``: whether features geometries shall be simplified. Default: true.
-* ``WRITE_GEO_PDF``: whether a GeoPDF shall be exported. Default: false.
+* ``WRITE_GEO_PDF``: whether a Geospatial PDF shall be exported. Default: false.
 * ``USE_ISO_32000_EXTENSION_FORMAT_GEOREFERENCING``: whether Iso32000 georeferencing shall be used. Default: false.
 * ``USE_OGC_BEST_PRACTICE_FORMAT_GEOREFERENCING``: whether OGC best practice georeferencing shall be used. Default: false.
-* ``EXPORT_THEMES``: a comma separated list of map themes to use for a GeoPDF export
+* ``EXPORT_THEMES``: a comma separated list of map themes to use for a Geospatial PDF export
 * ``PREDEFINED_MAP_SCALES``: a comma separated list of map scales to render the map
 * ``LOSSLESS_IMAGE_COMPRESSION``: whether images embedded in pdf must be compressed using a lossless algorithm. Default: false.
 * ``DISABLE_TILED_RASTER_RENDERING``: whether rasters shall be untiled in the pdf. Default: false.
diff --git a/docs/user_manual/map_views/map_view.rst b/docs/user_manual/map_views/map_view.rst
index 0db154dc625..88d078ad416 100644
--- a/docs/user_manual/map_views/map_view.rst
+++ b/docs/user_manual/map_views/map_view.rst
@@ -1271,21 +1271,21 @@ In the dialog that opens:
 
    * |checkbox| :guilabel:`Export RDF metadata` of the document such
      as the title, author, date, description...
-   * |unchecked| :guilabel:`Create Geospatial PDF (GeoPDF)`: Generate a
+   * |unchecked| :guilabel:`Create Geospatial PDF`: Generate a
      `georeferenced PDF file <https://gdal.org/drivers/raster/pdf.html>`_.
      You can:
 
-     * Choose the GeoPDF :guilabel:`Format`
+     * Choose the Geospatial PDF :guilabel:`Format`
      * |checkbox| :guilabel:`Include vector feature information` in the
-       GeoPDF file: will include all the geometry and attribute
+       Geospatial PDF file: will include all the geometry and attribute
        information from features visible within the map in the output
-       GeoPDF file.
+       Geospatial PDF file.
 
      .. note::
 
-       A GeoPDF file can also be used as a data source.
-       For more on GeoPDF support in QGIS, see
-       https://north-road.com/2019/09/03/qgis-3-10-loves-geopdf/.
+       A Geospatial PDF file can also be used as a data source.
+       For more on Geospatial PDF support in QGIS, see
+       https://north-road.com/2019/09/03/qgis-3-10-loves-geospatialpdf/.
 
    * :guilabel:`Rasterize map`
    * |checkbox| :guilabel:`Simplify geometries to reduce output file
diff --git a/docs/user_manual/print_composer/create_output.rst b/docs/user_manual/print_composer/create_output.rst
index d32392862e5..c066d332c67 100644
--- a/docs/user_manual/print_composer/create_output.rst
+++ b/docs/user_manual/print_composer/create_output.rst
@@ -244,7 +244,7 @@ To export a layout as PDF:
      * or :guilabel:`Lossless`, which creates bigger files in most cases, but is
        much more suitable for printing outputs or for post-production in external
        applications (requires Qt 5.13 or later).
-   * |unchecked| :guilabel:`Create Geospatial PDF (GeoPDF)`:
+   * |unchecked| :guilabel:`Create Geospatial PDF`:
      Generate a georeferenced PDF file.
    * |unchecked| :guilabel:`Disable tiled raster layer exports`: When exporting
      files, QGIS uses tiled based rendering that saves memory.
@@ -269,10 +269,10 @@ To export a layout as PDF:
 
    PDF Export Options
 
-.. note:: GeoPDF export is supported, and a number of GeoPDF specific options
+.. note:: Geospatial PDF export is supported, and a number of Geospatial PDF specific options
    are available:
    
-   * :guilabel:`Format` (GeoPDF format - there are some GeoPDF variations),
+   * :guilabel:`Format` (Geospatial PDF format - there are some variations),
    * :guilabel:`Include multiple map themes` (specify map themes to include),
    * :guilabel:`Include vector feature information` (choose the layers and
      group them into logical PDF groups).
diff --git a/docs/user_manual/working_with_vector/vector_properties.rst b/docs/user_manual/working_with_vector/vector_properties.rst
index 7f3f1fe32bf..78d0ab982e1 100644
--- a/docs/user_manual/working_with_vector/vector_properties.rst
+++ b/docs/user_manual/working_with_vector/vector_properties.rst
@@ -3201,7 +3201,7 @@ feature identification:
     features in all layers
   * the feature identifier in the attribute table :ref:`form view <attribute_table_view>`
   * the feature identifier when the map or layout is exported to a layered
-    output format such as GeoPDF
+    output format such as Geospatial PDF
   * the map tip information, i.e. the message displayed in the map canvas
     when hovering over a feature of the active layer with the |mapTips| :sup:`Show Map Tips` icon pressed.
     Applicable when |checkbox| :guilabel:`Enable Map Tips` is active