diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake/dependencies.patch
similarity index 100%
rename from ports/gz-cmake3/dependencies.patch
rename to ports/gz-cmake/dependencies.patch
diff --git a/ports/gz-cmake/portfile.cmake b/ports/gz-cmake/portfile.cmake
new file mode 100644
index 00000000000000..7cec772d987871
--- /dev/null
+++ b/ports/gz-cmake/portfile.cmake
@@ -0,0 +1,20 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+    NAME ${PACKAGE_NAME}
+    REF ${PORT}${VERSION_MAJOR}_${VERSION}
+    VERSION ${VERSION}
+    SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69
+    PATCHES
+        dependencies.patch
+)
+
+
+
+file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}/${PACKAGE_NAME}${VERSION_MAJOR}")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-cmake3/usage b/ports/gz-cmake/usage
similarity index 100%
rename from ports/gz-cmake3/usage
rename to ports/gz-cmake/usage
diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake/vcpkg.json
similarity index 86%
rename from ports/gz-cmake3/vcpkg.json
rename to ports/gz-cmake/vcpkg.json
index 7877778e3ef477..132876440f7338 100644
--- a/ports/gz-cmake3/vcpkg.json
+++ b/ports/gz-cmake/vcpkg.json
@@ -1,7 +1,6 @@
 {
-  "name": "gz-cmake3",
+  "name": "gz-cmake",
   "version": "3.4.1",
-  "port-version": 5,
   "description": "CMake helper functions for building robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/cmake",
   "license": null,
diff --git a/ports/gz-cmake3/vcpkg/GTS.cmake b/ports/gz-cmake/vcpkg/GTS.cmake
similarity index 100%
rename from ports/gz-cmake3/vcpkg/GTS.cmake
rename to ports/gz-cmake/vcpkg/GTS.cmake
diff --git a/ports/gz-cmake3/vcpkg/TINYXML2.cmake b/ports/gz-cmake/vcpkg/TINYXML2.cmake
similarity index 100%
rename from ports/gz-cmake3/vcpkg/TINYXML2.cmake
rename to ports/gz-cmake/vcpkg/TINYXML2.cmake
diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake
deleted file mode 100644
index c1665d6dd01292..00000000000000
--- a/ports/gz-cmake3/portfile.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(PACKAGE_NAME cmake)
-
-ignition_modular_library(
-    NAME ${PACKAGE_NAME}
-    REF ${PORT}_${VERSION}
-    VERSION ${VERSION}
-    SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69
-    PATCHES
-        dependencies.patch
-)
-
-file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/gz-cmake3/cmake3")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/ports/gz-common5/003-include-chrono.patch b/ports/gz-common/003-include-chrono.patch
similarity index 100%
rename from ports/gz-common5/003-include-chrono.patch
rename to ports/gz-common/003-include-chrono.patch
diff --git a/ports/gz-common5/gz_remotery_vis.patch b/ports/gz-common/gz_remotery_vis.patch
similarity index 100%
rename from ports/gz-common5/gz_remotery_vis.patch
rename to ports/gz-common/gz_remotery_vis.patch
diff --git a/ports/gz-common5/portfile.cmake b/ports/gz-common/portfile.cmake
similarity index 60%
rename from ports/gz-common5/portfile.cmake
rename to ports/gz-common/portfile.cmake
index 07b413c5d1fdcf..cef74c26df98df 100644
--- a/ports/gz-common5/portfile.cmake
+++ b/ports/gz-common/portfile.cmake
@@ -1,8 +1,10 @@
-set(PACKAGE_NAME common)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 ignition_modular_library(
    NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
    VERSION ${VERSION}
    SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee
    OPTIONS 
@@ -14,14 +16,17 @@ ignition_modular_library(
       003-include-chrono.patch
 )
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gz-common5-graphics/gz-common5-graphics-config.cmake" "find_package(GTS "
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-graphics/${PORT}${VERSION_MAJOR}-graphics-config.cmake" "find_package(GTS "
 "# Ensure that consumers get a pkg-config tool which is needed for GTS
 set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg)
 find_package(GTS "
 IGNORE_UNCHANGED)
 
 foreach(component IN ITEMS av events geospatial graphics io profiler testing)
-   if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}-${component}/${PORT}-${component}-config.cmake")
+   if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-${component}/${PORT}${VERSION_MAJOR}-${component}-config.cmake")
       message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.")
    endif()
 endforeach()
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-common5/vcpkg.json b/ports/gz-common/vcpkg.json
similarity index 88%
rename from ports/gz-common5/vcpkg.json
rename to ports/gz-common/vcpkg.json
index 4e0ef293e91227..61b0784ab5a1de 100644
--- a/ports/gz-common5/vcpkg.json
+++ b/ports/gz-common/vcpkg.json
@@ -1,7 +1,6 @@
 {
-  "name": "gz-common5",
+  "name": "gz-common",
   "version": "5.4.1",
-  "port-version": 3,
   "description": "Common libraries for robotics applications",
   "homepage": "https://ignitionrobotics.org/libs/common",
   "license": "Apache-2.0",
@@ -15,8 +14,8 @@
     "freeimage",
     "gdal",
     "gts",
-    "gz-cmake3",
-    "gz-math7",
+    "gz-cmake",
+    "gz-math",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-fuel-tools/portfile.cmake b/ports/gz-fuel-tools/portfile.cmake
new file mode 100644
index 00000000000000..f2935507d27a1d
--- /dev/null
+++ b/ports/gz-fuel-tools/portfile.cmake
@@ -0,0 +1,16 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf
+   OPTIONS 
+   PATCHES
+      remove_docs.patch
+)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-fuel-tools8/remove_docs.patch b/ports/gz-fuel-tools/remove_docs.patch
similarity index 100%
rename from ports/gz-fuel-tools8/remove_docs.patch
rename to ports/gz-fuel-tools/remove_docs.patch
diff --git a/ports/gz-fuel-tools8/vcpkg.json b/ports/gz-fuel-tools/vcpkg.json
similarity index 81%
rename from ports/gz-fuel-tools8/vcpkg.json
rename to ports/gz-fuel-tools/vcpkg.json
index f36144596da374..3a1e4899213546 100644
--- a/ports/gz-fuel-tools8/vcpkg.json
+++ b/ports/gz-fuel-tools/vcpkg.json
@@ -1,14 +1,14 @@
 {
-  "name": "gz-fuel-tools8",
+  "name": "gz-fuel-tools",
   "version": "8.1.0",
   "description": "Tools for using fuel API to download robot models",
   "homepage": "https://gazebosim.org/libs/fuel_tools",
   "license": null,
   "dependencies": [
     "curl",
-    "gz-cmake3",
-    "gz-common5",
-    "gz-msgs9",
+    "gz-cmake",
+    "gz-common",
+    "gz-msgs",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-fuel-tools8/portfile.cmake b/ports/gz-fuel-tools8/portfile.cmake
deleted file mode 100644
index cce4c10294bbe7..00000000000000
--- a/ports/gz-fuel-tools8/portfile.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PACKAGE_NAME fuel-tools)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf
-   OPTIONS 
-   PATCHES
-      remove_docs.patch
-)
diff --git a/ports/gz-gui7/dependencies.patch b/ports/gz-gui/dependencies.patch
similarity index 100%
rename from ports/gz-gui7/dependencies.patch
rename to ports/gz-gui/dependencies.patch
diff --git a/ports/gz-gui7/portfile.cmake b/ports/gz-gui/portfile.cmake
similarity index 57%
rename from ports/gz-gui7/portfile.cmake
rename to ports/gz-gui/portfile.cmake
index c9a42982267012..0ac3b723882096 100644
--- a/ports/gz-gui7/portfile.cmake
+++ b/ports/gz-gui/portfile.cmake
@@ -1,8 +1,10 @@
-set(PACKAGE_NAME gui)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 ignition_modular_library(
    NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
    VERSION ${VERSION}
    SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f
    OPTIONS 
@@ -11,13 +13,13 @@ ignition_modular_library(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)   
-   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-gui-7/plugins/*.dll")
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/plugins/*.dll")
    if (NOT plugins STREQUAL "")
       file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
       file(REMOVE ${plugins})
    endif()
 
-   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-gui-7/plugins/*.dll")
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/plugins/*.dll")
    if (NOT plugins_debug STREQUAL "")
       file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
       file(REMOVE ${plugins_debug})
@@ -26,3 +28,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
     # Lacking pc files for Qt
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 endif()
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-gui7/vcpkg.json b/ports/gz-gui/vcpkg.json
similarity index 76%
rename from ports/gz-gui7/vcpkg.json
rename to ports/gz-gui/vcpkg.json
index a70f344915dbd1..594bb371ad2201 100644
--- a/ports/gz-gui7/vcpkg.json
+++ b/ports/gz-gui/vcpkg.json
@@ -1,18 +1,18 @@
 {
-  "name": "gz-gui7",
+  "name": "gz-gui",
   "version": "7.2.1",
   "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.",
   "homepage": "https://gazebosim.org/libs/gui",
   "license": "Apache-2.0",
   "dependencies": [
-    "gz-cmake3",
-    "gz-common5",
-    "gz-math7",
-    "gz-msgs9",
-    "gz-plugin2",
-    "gz-rendering7",
-    "gz-transport12",
-    "gz-utils2",
+    "gz-cmake",
+    "gz-common",
+    "gz-math",
+    "gz-msgs",
+    "gz-plugin",
+    "gz-rendering",
+    "gz-transport",
+    "gz-utils",
     {
       "name": "ignition-modularscripts",
       "host": true
@@ -26,7 +26,7 @@
       "name": "qt5-quickcontrols2",
       "default-features": false
     },
-    "sdformat13",
+    "sdformat",
     "tinyxml2"
   ]
 }
diff --git a/ports/gz-math/portfile.cmake b/ports/gz-math/portfile.cmake
new file mode 100644
index 00000000000000..a274a530410ab8
--- /dev/null
+++ b/ports/gz-math/portfile.cmake
@@ -0,0 +1,17 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+    NAME ${PACKAGE_NAME}
+    REF ${PORT}${VERSION_MAJOR}_${VERSION}
+    VERSION ${VERSION}
+    SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed
+    OPTIONS
+        -DSKIP_SWIG=ON
+        -DSKIP_PYBIND11=ON
+        -DBUILD_DOCS=OFF
+)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-math7/vcpkg.json b/ports/gz-math/vcpkg.json
similarity index 82%
rename from ports/gz-math7/vcpkg.json
rename to ports/gz-math/vcpkg.json
index 762e221fb5974b..dee63016c068dd 100644
--- a/ports/gz-math7/vcpkg.json
+++ b/ports/gz-math/vcpkg.json
@@ -1,13 +1,13 @@
 {
-  "name": "gz-math7",
+  "name": "gz-math",
   "version": "7.3.0",
   "description": "Math API for robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/math",
   "license": null,
   "dependencies": [
     "eigen3",
-    "gz-cmake3",
-    "gz-utils2",
+    "gz-cmake",
+    "gz-utils",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-math7/portfile.cmake b/ports/gz-math7/portfile.cmake
deleted file mode 100644
index 3891614c7c1eec..00000000000000
--- a/ports/gz-math7/portfile.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-set(PACKAGE_NAME math)
-
-ignition_modular_library(
-    NAME "${PACKAGE_NAME}"
-    REF "${PORT}_${VERSION}"
-    VERSION "${VERSION}"
-    SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed
-    OPTIONS
-        -DSKIP_SWIG=ON
-        -DSKIP_PYBIND11=ON
-        -DBUILD_DOCS=OFF
-)
diff --git a/ports/gz-msgs9/portfile.cmake b/ports/gz-msgs/portfile.cmake
similarity index 52%
rename from ports/gz-msgs9/portfile.cmake
rename to ports/gz-msgs/portfile.cmake
index c01438d2475c49..863463d381b2f1 100644
--- a/ports/gz-msgs9/portfile.cmake
+++ b/ports/gz-msgs/portfile.cmake
@@ -1,4 +1,6 @@
-set(PACKAGE_NAME msgs)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
@@ -6,10 +8,13 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 
 ignition_modular_library(
    NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
    VERSION ${VERSION}
    SHA512 669e60fc35868e4d86695104a58aecaef9ad08861cba97ff91c7306caf66ec237da46c0a13f5f59907371fc7a4dd56d5506fabe4ba97c393889fc5a9c2a101ee
    OPTIONS 
    PATCHES
       remove_ruby.patch
 )
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-msgs9/remove_ruby.patch b/ports/gz-msgs/remove_ruby.patch
similarity index 100%
rename from ports/gz-msgs9/remove_ruby.patch
rename to ports/gz-msgs/remove_ruby.patch
diff --git a/ports/gz-msgs9/vcpkg.json b/ports/gz-msgs/vcpkg.json
similarity index 83%
rename from ports/gz-msgs9/vcpkg.json
rename to ports/gz-msgs/vcpkg.json
index d854172cdfc4d7..4ece0b773cb96b 100644
--- a/ports/gz-msgs9/vcpkg.json
+++ b/ports/gz-msgs/vcpkg.json
@@ -1,12 +1,12 @@
 {
-  "name": "gz-msgs9",
+  "name": "gz-msgs",
   "version": "9.5.0",
   "description": "Middleware protobuf messages for robotics",
   "license": "Apache-2.0",
   "supports": "!(android | arm | uwp)",
   "dependencies": [
-    "gz-cmake3",
-    "gz-math7",
+    "gz-cmake",
+    "gz-math",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-physics6/dependencies.patch b/ports/gz-physics/dependencies.patch
similarity index 100%
rename from ports/gz-physics6/dependencies.patch
rename to ports/gz-physics/dependencies.patch
diff --git a/ports/gz-physics6/portfile.cmake b/ports/gz-physics/portfile.cmake
similarity index 52%
rename from ports/gz-physics6/portfile.cmake
rename to ports/gz-physics/portfile.cmake
index d6b1087a807423..f6e15cd7ac1286 100644
--- a/ports/gz-physics6/portfile.cmake
+++ b/ports/gz-physics/portfile.cmake
@@ -1,8 +1,10 @@
-set(PACKAGE_NAME physics)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 ignition_modular_library(
    NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
    VERSION ${VERSION}
    SHA512 c29594663509234e25c7d0a33848c0fe222c2b9471513978c18ea6873a17c66c43b4037c74e8849995fa6449c2dddc0f2ee669605893daf65119c277a17f39e1
    OPTIONS 
@@ -11,15 +13,18 @@ ignition_modular_library(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)   
-   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-physics-6/engine-plugins/*.dll")
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
    if (NOT plugins STREQUAL "")
       file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
       file(REMOVE ${plugins})
    endif()
 
-   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-physics-6/engine-plugins/*.dll")
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
    if (NOT plugins_debug STREQUAL "")
       file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
       file(REMOVE ${plugins_debug})
    endif()
 endif()
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-physics6/vcpkg.json b/ports/gz-physics/vcpkg.json
similarity index 72%
rename from ports/gz-physics6/vcpkg.json
rename to ports/gz-physics/vcpkg.json
index e72fe3c34e8c5a..8da7f434f50368 100644
--- a/ports/gz-physics6/vcpkg.json
+++ b/ports/gz-physics/vcpkg.json
@@ -1,7 +1,6 @@
 {
-  "name": "gz-physics6",
+  "name": "gz-physics",
   "version": "6.5.1",
-  "port-version": 1,
   "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.",
   "homepage": "https://gazebosim.org/libs/physics",
   "license": "Apache-2.0",
@@ -9,15 +8,15 @@
     "bullet3",
     "dartsim",
     "eigen3",
-    "gz-cmake3",
-    "gz-common5",
-    "gz-math7",
-    "gz-plugin2",
-    "gz-utils2",
+    "gz-cmake",
+    "gz-common",
+    "gz-math",
+    "gz-plugin",
+    "gz-utils",
     {
       "name": "ignition-modularscripts",
       "host": true
     },
-    "sdformat13"
+    "sdformat"
   ]
 }
diff --git a/ports/gz-plugin/portfile.cmake b/ports/gz-plugin/portfile.cmake
new file mode 100644
index 00000000000000..4dad741176ac4c
--- /dev/null
+++ b/ports/gz-plugin/portfile.cmake
@@ -0,0 +1,15 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 4c497291f8e33aae3a5752607a7fd7b48912e209f0f424ea7b1e6d35f27d1e920d1dd97ee64b7b3846d7d433618742be5d19352cbce8f6f63eccc83a086520ea
+   OPTIONS 
+   PATCHES
+)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-plugin2/vcpkg.json b/ports/gz-plugin/vcpkg.json
similarity index 87%
rename from ports/gz-plugin2/vcpkg.json
rename to ports/gz-plugin/vcpkg.json
index cf363c0f10c72a..408026cff6fa93 100644
--- a/ports/gz-plugin2/vcpkg.json
+++ b/ports/gz-plugin/vcpkg.json
@@ -1,5 +1,5 @@
 {
-  "name": "gz-plugin2",
+  "name": "gz-plugin",
   "version": "2.0.1",
   "description": "Library for registering plugin libraries and dynamically loading them at runtime",
   "homepage": "https://ignitionrobotics.org/libs/plugin",
@@ -10,8 +10,8 @@
       "name": "dlfcn-win32",
       "platform": "windows | uwp"
     },
-    "gz-cmake3",
-    "gz-utils2",
+    "gz-cmake",
+    "gz-utils",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-plugin2/portfile.cmake b/ports/gz-plugin2/portfile.cmake
deleted file mode 100644
index 58d3f6950d3616..00000000000000
--- a/ports/gz-plugin2/portfile.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PACKAGE_NAME plugin)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 4c497291f8e33aae3a5752607a7fd7b48912e209f0f424ea7b1e6d35f27d1e920d1dd97ee64b7b3846d7d433618742be5d19352cbce8f6f63eccc83a086520ea
-   OPTIONS 
-   PATCHES
-)
diff --git a/ports/gz-rendering7/fix-dependencies.patch b/ports/gz-rendering/fix-dependencies.patch
similarity index 100%
rename from ports/gz-rendering7/fix-dependencies.patch
rename to ports/gz-rendering/fix-dependencies.patch
diff --git a/ports/gz-rendering7/portfile.cmake b/ports/gz-rendering/portfile.cmake
similarity index 52%
rename from ports/gz-rendering7/portfile.cmake
rename to ports/gz-rendering/portfile.cmake
index 0797333d63a5e5..bbc90c1c9ef0a5 100644
--- a/ports/gz-rendering7/portfile.cmake
+++ b/ports/gz-rendering/portfile.cmake
@@ -1,8 +1,10 @@
-set(PACKAGE_NAME rendering)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 ignition_modular_library(
    NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
    VERSION ${VERSION}
    SHA512 7c14b268694600b8529fef21130b34f516b26baac771c019b4248a67f84420c40d655e0abedf0b36c53b7cdf19941b3f4f3494696c831a83070632d004b30678
    OPTIONS 
@@ -11,15 +13,18 @@ ignition_modular_library(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)   
-   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-rendering-7/engine-plugins/*.dll")
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
    if (NOT plugins STREQUAL "")
       file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/")
       file(REMOVE ${plugins})
    endif()
 
-   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-rendering-7/engine-plugins/*.dll")
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
    if (NOT plugins_debug STREQUAL "")
       file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/")
       file(REMOVE ${plugins_debug})
    endif()
 endif()
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-rendering7/vcpkg.json b/ports/gz-rendering/vcpkg.json
similarity index 79%
rename from ports/gz-rendering7/vcpkg.json
rename to ports/gz-rendering/vcpkg.json
index e96824ce57d93c..2cd82fff55d548 100644
--- a/ports/gz-rendering7/vcpkg.json
+++ b/ports/gz-rendering/vcpkg.json
@@ -1,17 +1,16 @@
 {
-  "name": "gz-rendering7",
+  "name": "gz-rendering",
   "version": "7.4.1",
-  "port-version": 1,
   "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.",
   "homepage": "https://gazebosim.org/libs/rendering",
   "license": "Apache-2.0",
   "dependencies": [
     "freeimage",
-    "gz-cmake3",
-    "gz-common5",
-    "gz-math7",
-    "gz-plugin2",
-    "gz-utils2",
+    "gz-cmake",
+    "gz-common",
+    "gz-math",
+    "gz-plugin",
+    "gz-utils",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-sensors/portfile.cmake b/ports/gz-sensors/portfile.cmake
new file mode 100644
index 00000000000000..48de30d4a18bc5
--- /dev/null
+++ b/ports/gz-sensors/portfile.cmake
@@ -0,0 +1,15 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 968aab8d623c1716c4d0e164e70442e02ebe34f9277bcc48739c620124c80ba4896a846f9d052ac6d9b32b4d8805aee30b4f9c1248f75790de85718f659b6ff6
+   OPTIONS 
+   PATCHES
+)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-sensors7/vcpkg.json b/ports/gz-sensors/vcpkg.json
similarity index 70%
rename from ports/gz-sensors7/vcpkg.json
rename to ports/gz-sensors/vcpkg.json
index ccf330ba3fb4a3..4614509c12edd4 100644
--- a/ports/gz-sensors7/vcpkg.json
+++ b/ports/gz-sensors/vcpkg.json
@@ -1,21 +1,21 @@
 {
-  "name": "gz-sensors7",
+  "name": "gz-sensors",
   "version": "7.3.0",
   "description": "Component of Gazebo, provides numerous sensor models designed to generate realistic data from simulation environments.",
   "homepage": "https://gazebosim.org/libs/sensors",
   "license": "Apache-2.0",
   "dependencies": [
-    "gz-cmake3",
-    "gz-common5",
-    "gz-math7",
-    "gz-msgs9",
-    "gz-rendering7",
-    "gz-transport12",
+    "gz-cmake",
+    "gz-common",
+    "gz-math",
+    "gz-msgs",
+    "gz-rendering",
+    "gz-transport",
     {
       "name": "ignition-modularscripts",
       "host": true
     },
     "protobuf",
-    "sdformat13"
+    "sdformat"
   ]
 }
diff --git a/ports/gz-sensors7/portfile.cmake b/ports/gz-sensors7/portfile.cmake
deleted file mode 100644
index babdef77c8d08c..00000000000000
--- a/ports/gz-sensors7/portfile.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PACKAGE_NAME sensors)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 968aab8d623c1716c4d0e164e70442e02ebe34f9277bcc48739c620124c80ba4896a846f9d052ac6d9b32b4d8805aee30b4f9c1248f75790de85718f659b6ff6
-   OPTIONS 
-   PATCHES
-)
diff --git a/ports/gz-tools2/portfile.cmake b/ports/gz-tools/portfile.cmake
similarity index 55%
rename from ports/gz-tools2/portfile.cmake
rename to ports/gz-tools/portfile.cmake
index 3b47a0ad5e99cd..aaf215ebbd519a 100644
--- a/ports/gz-tools2/portfile.cmake
+++ b/ports/gz-tools/portfile.cmake
@@ -1,8 +1,10 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-set(PACKAGE_NAME tools)
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
 
 ignition_modular_library(NAME ${PACKAGE_NAME}
-                         REF ${PORT}_${VERSION}
+                         REF ${PORT}${VERSION_MAJOR}_${VERSION}
                          VERSION ${VERSION}
                          SHA512 1b89048d09821db5a902758e133e6e73052941fdb9838daed5540267ef9203512170a031cf94a29564cac15133489609e83e965f31f930f7d7be477a8d9c2667
                          PATCHES
@@ -11,3 +13,6 @@ ignition_modular_library(NAME ${PACKAGE_NAME}
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-tools2/vcpkg.json b/ports/gz-tools/vcpkg.json
similarity index 84%
rename from ports/gz-tools2/vcpkg.json
rename to ports/gz-tools/vcpkg.json
index aaed20b351f143..f18756d3da0e0c 100644
--- a/ports/gz-tools2/vcpkg.json
+++ b/ports/gz-tools/vcpkg.json
@@ -1,13 +1,12 @@
 {
-  "name": "gz-tools2",
+  "name": "gz-tools",
   "version": "2.0.0",
-  "port-version": 1,
   "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.",
   "homepage": "https://gazebosim.org",
   "license": "Apache-2.0",
   "supports": "!(arm & windows) & !uwp",
   "dependencies": [
-    "gz-cmake3",
+    "gz-cmake",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-transport/portfile.cmake b/ports/gz-transport/portfile.cmake
new file mode 100644
index 00000000000000..879212764a263e
--- /dev/null
+++ b/ports/gz-transport/portfile.cmake
@@ -0,0 +1,16 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 734d4c2eccf42a3a5a665611c44ccb450bf290763bcf8dc169b16c0c5c5c7d7be6b3cb69c69a5ef64a502b411fdb1461f036c660d8d9188146e61cf8f4beead8
+   OPTIONS 
+   PATCHES
+      uuid-osx.patch
+)
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
diff --git a/ports/gz-transport12/uuid-osx.patch b/ports/gz-transport/uuid-osx.patch
similarity index 100%
rename from ports/gz-transport12/uuid-osx.patch
rename to ports/gz-transport/uuid-osx.patch
diff --git a/ports/gz-transport12/vcpkg.json b/ports/gz-transport/vcpkg.json
similarity index 84%
rename from ports/gz-transport12/vcpkg.json
rename to ports/gz-transport/vcpkg.json
index 639e493fe76a5b..16dff598b35909 100644
--- a/ports/gz-transport12/vcpkg.json
+++ b/ports/gz-transport/vcpkg.json
@@ -1,12 +1,12 @@
 {
-  "name": "gz-transport12",
+  "name": "gz-transport",
   "version": "12.2.1",
   "description": "Transport middleware for robotics",
   "license": null,
   "dependencies": [
     "cppzmq",
-    "gz-cmake3",
-    "gz-msgs9",
+    "gz-cmake",
+    "gz-msgs",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-transport12/portfile.cmake b/ports/gz-transport12/portfile.cmake
deleted file mode 100644
index 0a9c99f0726cc6..00000000000000
--- a/ports/gz-transport12/portfile.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PACKAGE_NAME transport)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 734d4c2eccf42a3a5a665611c44ccb450bf290763bcf8dc169b16c0c5c5c7d7be6b3cb69c69a5ef64a502b411fdb1461f036c660d8d9188146e61cf8f4beead8
-   OPTIONS 
-   PATCHES
-      uuid-osx.patch
-)
diff --git a/ports/gz-utils/portfile.cmake b/ports/gz-utils/portfile.cmake
new file mode 100644
index 00000000000000..bfddbca13bb002
--- /dev/null
+++ b/ports/gz-utils/portfile.cmake
@@ -0,0 +1,13 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(NAME ${PACKAGE_NAME}
+                         REF ${PORT}${VERSION_MAJOR}_${VERSION}
+                         VERSION ${VERSION}
+                         SHA512 2e896e7106591a427fd5a732ba7dbfb329a3c0ec70601f5bf9b2390907e37b41837fd06696f4a93fb4ccc16a94a0221e4734e59f9fb1c7e5a016a076800d8214
+                         PATCHES
+                        )
+
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}")
diff --git a/ports/gz-utils2/vcpkg.json b/ports/gz-utils/vcpkg.json
similarity index 89%
rename from ports/gz-utils2/vcpkg.json
rename to ports/gz-utils/vcpkg.json
index d546673ffc3b18..f8208d81894872 100644
--- a/ports/gz-utils2/vcpkg.json
+++ b/ports/gz-utils/vcpkg.json
@@ -1,11 +1,11 @@
 {
-  "name": "gz-utils2",
+  "name": "gz-utils",
   "version": "2.0.0",
   "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.",
   "homepage": "https://gazebosim.org",
   "license": "Apache-2.0",
   "dependencies": [
-    "gz-cmake3",
+    "gz-cmake",
     {
       "name": "ignition-modularscripts",
       "host": true
diff --git a/ports/gz-utils2/portfile.cmake b/ports/gz-utils2/portfile.cmake
deleted file mode 100644
index 8f3eef2e90a0cd..00000000000000
--- a/ports/gz-utils2/portfile.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-set(PACKAGE_NAME utils)
-
-ignition_modular_library(NAME ${PACKAGE_NAME}
-                         REF ${PORT}_${VERSION}
-                         VERSION ${VERSION}
-                         SHA512 2e896e7106591a427fd5a732ba7dbfb329a3c0ec70601f5bf9b2390907e37b41837fd06696f4a93fb4ccc16a94a0221e4734e59f9fb1c7e5a016a076800d8214
-                         PATCHES
-                        )
diff --git a/ports/sdformat13/cmake-config.patch b/ports/sdformat/cmake-config.patch
similarity index 100%
rename from ports/sdformat13/cmake-config.patch
rename to ports/sdformat/cmake-config.patch
diff --git a/ports/sdformat13/fix-find-urdfdom.patch b/ports/sdformat/fix-find-urdfdom.patch
similarity index 100%
rename from ports/sdformat13/fix-find-urdfdom.patch
rename to ports/sdformat/fix-find-urdfdom.patch
diff --git a/ports/sdformat13/no-absolute.patch b/ports/sdformat/no-absolute.patch
similarity index 100%
rename from ports/sdformat13/no-absolute.patch
rename to ports/sdformat/no-absolute.patch
diff --git a/ports/sdformat13/portfile.cmake b/ports/sdformat/portfile.cmake
similarity index 71%
rename from ports/sdformat13/portfile.cmake
rename to ports/sdformat/portfile.cmake
index f566c6168df105..5ae5a76364612d 100644
--- a/ports/sdformat13/portfile.cmake
+++ b/ports/sdformat/portfile.cmake
@@ -1,9 +1,11 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO gazebosim/sdformat
-    REF "sdformat13_${VERSION}"
+    REPO gazebosim/${PORT}
+    REF ${PORT}${VERSION_MAJOR}_${VERSION}
     SHA512 10c56fab3957fff759c3ff7db401e162c5d353221e3895617182031be41e10a5234607fb7d1afb0ec453f3e1f20ddcc36b8488ed3d1cc2d1d0e915fc3a74ddbd
-    HEAD_REF sdf13
+    HEAD_REF sdf${VERSION_MAJOR}
     PATCHES
         no-absolute.patch
         cmake-config.patch
@@ -25,11 +27,14 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat13")
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}${VERSION_MAJOR}")
 vcpkg_fixup_pkgconfig()
 
+# preserve the original port behavior
+file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/")
+
 # fix dependency urdfdom
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/sdformat13-config.cmake" "find_package(TINYXML2" [[
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}/${PORT}${VERSION_MAJOR}-config.cmake" "find_package(TINYXML2" [[
 if (NOT TARGET GzURDFDOM::GzURDFDOM)
     find_package(urdfdom CONFIG ${gz_package_quiet} ${gz_package_required})
     add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED)
diff --git a/ports/sdformat13/vcpkg.json b/ports/sdformat/vcpkg.json
similarity index 80%
rename from ports/sdformat13/vcpkg.json
rename to ports/sdformat/vcpkg.json
index 1282adb190ada3..1e6f8af5b4996d 100644
--- a/ports/sdformat13/vcpkg.json
+++ b/ports/sdformat/vcpkg.json
@@ -1,15 +1,15 @@
 {
-  "name": "sdformat13",
+  "name": "sdformat",
   "version": "13.6.0",
   "description": "Simulation Description Format (SDF) parser and description files.",
   "homepage": "http://sdformat.org/",
   "license": "Apache-2.0",
   "supports": "!uwp",
   "dependencies": [
-    "gz-math7",
-    "gz-tools2",
-    "gz-utils2",
-    "tinyxml2",
+    "gz-math",
+    "gz-tools",
+    "gz-utils",
+    "tinyxml",
     "urdfdom",
     {
       "name": "vcpkg-cmake",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index f8cdb98fe74bab..f11ef8014079b1 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -433,10 +433,10 @@ gstreamer:x64-windows-static-md = skip
 gul14:arm-neon-android=fail
 gul14:arm64-android=fail
 gul14:x64-android=fail
-gz-tools2:arm-neon-android=fail
-gz-tools2:x64-android=fail
-gz-tools2:arm64-android=fail
-gz-gui7:x64-osx=fail
+gz-tools:arm-neon-android=fail
+gz-tools:x64-android=fail
+gz-tools:arm64-android=fail
+gz-gui:x64-osx=fail
 halide:x64-windows-static=fail
 hexl:x64-android=fail
 highs:arm-neon-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index fb49f29fadd506..f95a3da2b97e1c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3356,55 +3356,55 @@
       "baseline": "0.12.3",
       "port-version": 0
     },
-    "gz-cmake3": {
+    "gz-cmake": {
       "baseline": "3.4.1",
-      "port-version": 5
+      "port-version": 0
     },
-    "gz-common5": {
+    "gz-common": {
       "baseline": "5.4.1",
-      "port-version": 3
+      "port-version": 0
     },
-    "gz-fuel-tools8": {
+    "gz-fuel-tools": {
       "baseline": "8.1.0",
       "port-version": 0
     },
-    "gz-gui7": {
+    "gz-gui": {
       "baseline": "7.2.1",
       "port-version": 0
     },
-    "gz-math7": {
+    "gz-math": {
       "baseline": "7.3.0",
       "port-version": 0
     },
-    "gz-msgs9": {
+    "gz-msgs": {
       "baseline": "9.5.0",
       "port-version": 0
     },
-    "gz-physics6": {
+    "gz-physics": {
       "baseline": "6.5.1",
-      "port-version": 1
+      "port-version": 0
     },
-    "gz-plugin2": {
+    "gz-plugin": {
       "baseline": "2.0.1",
       "port-version": 0
     },
-    "gz-rendering7": {
+    "gz-rendering": {
       "baseline": "7.4.1",
-      "port-version": 1
+      "port-version": 0
     },
-    "gz-sensors7": {
+    "gz-sensors": {
       "baseline": "7.3.0",
       "port-version": 0
     },
-    "gz-tools2": {
+    "gz-tools": {
       "baseline": "2.0.0",
-      "port-version": 1
+      "port-version": 0
     },
-    "gz-transport12": {
+    "gz-transport": {
       "baseline": "12.2.1",
       "port-version": 0
     },
-    "gz-utils2": {
+    "gz-utils": {
       "baseline": "2.0.0",
       "port-version": 0
     },
@@ -8204,7 +8204,7 @@
       "baseline": "2025-01-25",
       "port-version": 0
     },
-    "sdformat13": {
+    "sdformat": {
       "baseline": "13.6.0",
       "port-version": 0
     },
diff --git a/versions/g-/gz-cmake.json b/versions/g-/gz-cmake.json
new file mode 100644
index 00000000000000..862a41241ce63c
--- /dev/null
+++ b/versions/g-/gz-cmake.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "63c502c2e27c6a798cb7e58f79f3ff45132b9bfc",
+      "version": "3.4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-common.json b/versions/g-/gz-common.json
new file mode 100644
index 00000000000000..c31ff092b3a711
--- /dev/null
+++ b/versions/g-/gz-common.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "48cc1a154a14620489453585504961510d969399",
+      "version": "5.4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-fuel-tools.json b/versions/g-/gz-fuel-tools.json
new file mode 100644
index 00000000000000..56b8ceface73b2
--- /dev/null
+++ b/versions/g-/gz-fuel-tools.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d09682c9b4a86de1c052e6483d293dfb5ed35dae",
+      "version": "8.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-gui.json b/versions/g-/gz-gui.json
new file mode 100644
index 00000000000000..e573bf9ab4ea84
--- /dev/null
+++ b/versions/g-/gz-gui.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "138afd102513ed5abc0b9f5f2cc2e7a992c4f24e",
+      "version": "7.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-math.json b/versions/g-/gz-math.json
new file mode 100644
index 00000000000000..72cd0e27c1e7f8
--- /dev/null
+++ b/versions/g-/gz-math.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a470845746e2d7a61d522a19e04199dab777efce",
+      "version": "7.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-msgs.json b/versions/g-/gz-msgs.json
new file mode 100644
index 00000000000000..fa3e951d0232ba
--- /dev/null
+++ b/versions/g-/gz-msgs.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "fac6c768d22122848be39605f8daa78f6f0e1135",
+      "version": "9.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-physics.json b/versions/g-/gz-physics.json
new file mode 100644
index 00000000000000..e822d7722adbe0
--- /dev/null
+++ b/versions/g-/gz-physics.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "daf78180552db2017f50dd6cb88de9f85de29fe0",
+      "version": "6.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-plugin.json b/versions/g-/gz-plugin.json
new file mode 100644
index 00000000000000..621440cb0f7a87
--- /dev/null
+++ b/versions/g-/gz-plugin.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2bb6e7fddd43a6386f9a6953094617854dec0ff4",
+      "version": "2.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-rendering.json b/versions/g-/gz-rendering.json
new file mode 100644
index 00000000000000..9a070bc8d81ca4
--- /dev/null
+++ b/versions/g-/gz-rendering.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b4178060edfacf55665c99e07d28cd821290cea2",
+      "version": "7.4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-sensors.json b/versions/g-/gz-sensors.json
new file mode 100644
index 00000000000000..d9841d942465b6
--- /dev/null
+++ b/versions/g-/gz-sensors.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d5e4205aabecf6757f4c667612f850867a234d18",
+      "version": "7.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-tools.json b/versions/g-/gz-tools.json
new file mode 100644
index 00000000000000..2697237f2577ac
--- /dev/null
+++ b/versions/g-/gz-tools.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "330b6d15d84ec3380e57dc4646da41a62553adba",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-transport.json b/versions/g-/gz-transport.json
new file mode 100644
index 00000000000000..9022a246c46b24
--- /dev/null
+++ b/versions/g-/gz-transport.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "cc4e5db6ff3729b2d119631eb1a571ed4819d83d",
+      "version": "12.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/g-/gz-utils.json b/versions/g-/gz-utils.json
new file mode 100644
index 00000000000000..88f5b4d42eb5f1
--- /dev/null
+++ b/versions/g-/gz-utils.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7ed63499e175403ce7e1a558d99554534ffd95e2",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/s-/sdformat.json b/versions/s-/sdformat.json
new file mode 100644
index 00000000000000..b7806b6ce87c62
--- /dev/null
+++ b/versions/s-/sdformat.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e6e84ed4e3c11c958655f6a161a94af753f976f8",
+      "version": "13.6.0",
+      "port-version": 0
+    }
+  ]
+}