diff --git a/example/centos/centos-9-aarch64-ami.yaml b/example/centos/centos-9-aarch64-ami.yaml
index 4bab75d0..c2d1c201 100644
--- a/example/centos/centos-9-aarch64-ami.yaml
+++ b/example/centos/centos-9-aarch64-ami.yaml
@@ -201,7 +201,7 @@ otk.target.osbuild:
           options:
             config:
               PasswordAuthentication: false
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: fragment/grub2/${architecture}.yaml
         - type: org.osbuild.systemd
diff --git a/example/centos/centos-9-aarch64-minimal-raw.yaml b/example/centos/centos-9-aarch64-minimal-raw.yaml
index b13bd2fb..d9f77e0b 100644
--- a/example/centos/centos-9-aarch64-minimal-raw.yaml
+++ b/example/centos/centos-9-aarch64-minimal-raw.yaml
@@ -103,7 +103,7 @@ otk.target.osbuild:
               Unit:
                 ConditionPathExists: '!/usr/libexec/greenboot/greenboot'
             unit-type: global
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: fragment/grub2/${architecture}.yaml
         - type: org.osbuild.copy
diff --git a/example/centos/centos-9-aarch64-qcow2.yaml b/example/centos/centos-9-aarch64-qcow2.yaml
index 9414d47d..b349f589 100644
--- a/example/centos/centos-9-aarch64-qcow2.yaml
+++ b/example/centos/centos-9-aarch64-qcow2.yaml
@@ -136,7 +136,7 @@ otk.target.osbuild:
             network:
               networking: true
               no_zero_conf: true
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: fragment/grub2/${architecture}.yaml
         - type: org.osbuild.systemd
diff --git a/example/centos/centos-9-aarch64-vhd.yaml b/example/centos/centos-9-aarch64-vhd.yaml
index eba144fb..44285cf1 100644
--- a/example/centos/centos-9-aarch64-vhd.yaml
+++ b/example/centos/centos-9-aarch64-vhd.yaml
@@ -252,7 +252,7 @@ otk.target.osbuild:
                     arg: NM_UNMANAGED
                   op: '='
                   val: '1'
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - type: org.osbuild.grub2
           options:
diff --git a/example/centos/centos-9-s390x-qcow2.yaml b/example/centos/centos-9-s390x-qcow2.yaml
index 03530b09..5b44e1a5 100644
--- a/example/centos/centos-9-s390x-qcow2.yaml
+++ b/example/centos/centos-9-s390x-qcow2.yaml
@@ -139,7 +139,7 @@ otk.target.osbuild:
             network:
               networking: true
               no_zero_conf: true
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - type: org.osbuild.zipl
           options: {}
diff --git a/example/centos/centos-9-x86_64-ami.yaml b/example/centos/centos-9-x86_64-ami.yaml
index 826df952..e6592c2e 100644
--- a/example/centos/centos-9-x86_64-ami.yaml
+++ b/example/centos/centos-9-x86_64-ami.yaml
@@ -220,7 +220,7 @@ otk.target.osbuild:
           options:
             config:
               PasswordAuthentication: false
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: "fragment/grub2/${architecture}.yaml"
         - type: org.osbuild.systemd
diff --git a/example/centos/centos-9-x86_64-minimal-raw.yaml b/example/centos/centos-9-x86_64-minimal-raw.yaml
index de558199..f6cbea29 100644
--- a/example/centos/centos-9-x86_64-minimal-raw.yaml
+++ b/example/centos/centos-9-x86_64-minimal-raw.yaml
@@ -102,7 +102,7 @@ otk.target.osbuild:
               Unit:
                 ConditionPathExists: '!/usr/libexec/greenboot/greenboot'
             unit-type: global
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: fragment/grub2/${architecture}-no-bios.yaml
         - type: org.osbuild.copy
diff --git a/example/centos/centos-9-x86_64-ova.yaml b/example/centos/centos-9-x86_64-ova.yaml
index a8b3e6c2..15ac984a 100644
--- a/example/centos/centos-9-x86_64-ova.yaml
+++ b/example/centos/centos-9-x86_64-ova.yaml
@@ -93,7 +93,7 @@ otk.target.osbuild:
             network:
               networking: true
               no_zero_conf: true
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: "fragment/grub2/${architecture}.yaml"
         - otk.include: "fragment/selinux/targeted.yaml"
diff --git a/example/centos/centos-9-x86_64-qcow2.yaml b/example/centos/centos-9-x86_64-qcow2.yaml
index a103845e..4c45b256 100644
--- a/example/centos/centos-9-x86_64-qcow2.yaml
+++ b/example/centos/centos-9-x86_64-qcow2.yaml
@@ -137,7 +137,7 @@ otk.target.osbuild:
             network:
               networking: true
               no_zero_conf: true
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: "fragment/grub2/${architecture}.yaml"
         - type: org.osbuild.systemd
diff --git a/example/centos/centos-9-x86_64-vhd.yaml b/example/centos/centos-9-x86_64-vhd.yaml
index 2a15a480..462c4dab 100644
--- a/example/centos/centos-9-x86_64-vhd.yaml
+++ b/example/centos/centos-9-x86_64-vhd.yaml
@@ -252,7 +252,7 @@ otk.target.osbuild:
                     arg: NM_UNMANAGED
                   op: '='
                   val: '1'
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - type: org.osbuild.grub2
           options:
diff --git a/example/centos/centos-9-x86_64-vmdk.yaml b/example/centos/centos-9-x86_64-vmdk.yaml
index ed7cd689..4f2f89b0 100644
--- a/example/centos/centos-9-x86_64-vmdk.yaml
+++ b/example/centos/centos-9-x86_64-vmdk.yaml
@@ -90,7 +90,7 @@ otk.target.osbuild:
             network:
               networking: true
               no_zero_conf: true
-        - otk.external.otk-make-fstab-stage:
+        - otk.external.osbuild-make-fstab-stage:
             ${filesystem}
         - otk.include: "fragment/grub2/${architecture}.yaml"
         - otk.include: "fragment/selinux/targeted.yaml"
diff --git a/example/centos/common/partition-table/aarch64/default.yaml b/example/centos/common/partition-table/aarch64/default.yaml
index 35cab370..329feb64 100644
--- a/example/centos/common/partition-table/aarch64/default.yaml
+++ b/example/centos/common/partition-table/aarch64/default.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -36,5 +36,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/aarch64/minimal-raw.yaml b/example/centos/common/partition-table/aarch64/minimal-raw.yaml
index e50c7f7a..95028fa8 100644
--- a/example/centos/common/partition-table/aarch64/minimal-raw.yaml
+++ b/example/centos/common/partition-table/aarch64/minimal-raw.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -37,5 +37,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/aarch64/vhd.yaml b/example/centos/common/partition-table/aarch64/vhd.yaml
index 6ba0cb2c..90e38e91 100644
--- a/example/centos/common/partition-table/aarch64/vhd.yaml
+++ b/example/centos/common/partition-table/aarch64/vhd.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -36,5 +36,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/s390x/default.yaml b/example/centos/common/partition-table/s390x/default.yaml
index d5dbb012..c3e8ba06 100644
--- a/example/centos/common/partition-table/s390x/default.yaml
+++ b/example/centos/common/partition-table/s390x/default.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -26,5 +26,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/x86_64/default.yaml b/example/centos/common/partition-table/x86_64/default.yaml
index 8d20c983..aafd8c19 100644
--- a/example/centos/common/partition-table/x86_64/default.yaml
+++ b/example/centos/common/partition-table/x86_64/default.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -36,5 +36,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/x86_64/minimal-raw.yaml b/example/centos/common/partition-table/x86_64/minimal-raw.yaml
index 90e68618..1ff84f10 100644
--- a/example/centos/common/partition-table/x86_64/minimal-raw.yaml
+++ b/example/centos/common/partition-table/x86_64/minimal-raw.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -37,5 +37,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/common/partition-table/x86_64/vhd_vmdk_ova.yaml b/example/centos/common/partition-table/x86_64/vhd_vmdk_ova.yaml
index d41dd6fd..eab68fb5 100644
--- a/example/centos/common/partition-table/x86_64/vhd_vmdk_ova.yaml
+++ b/example/centos/common/partition-table/x86_64/vhd_vmdk_ova.yaml
@@ -1,6 +1,6 @@
 otk.define:
   filesystem:
-    otk.external.otk-gen-partition-table:
+    otk.external.osbuild-gen-partition-table:
       modifications:
         ${filesystem.modifications}
       properties:
@@ -36,5 +36,5 @@ otk.define:
   # XXX: it would be nicer if the "fs_options" could be part of their
   # stages directly without this indirection.
   fs_options:
-    otk.external.otk-make-partition-mounts-devices:
+    otk.external.osbuild-make-partition-mounts-devices:
       ${filesystem}
diff --git a/example/centos/pipeline/image/aarch64.yaml b/example/centos/pipeline/image/aarch64.yaml
index 95a204c2..0750655b 100644
--- a/example/centos/pipeline/image/aarch64.yaml
+++ b/example/centos/pipeline/image/aarch64.yaml
@@ -3,7 +3,7 @@ build: name:build
 stages:
   otk.op.join:
     values:
-      - otk.external.otk-make-partition-stages:
+      - otk.external.osbuild-make-partition-stages:
           ${filesystem}
       - - type: org.osbuild.copy
           inputs:
diff --git a/example/centos/pipeline/image/s390x.yaml b/example/centos/pipeline/image/s390x.yaml
index b5c5094e..2bbebcc7 100644
--- a/example/centos/pipeline/image/s390x.yaml
+++ b/example/centos/pipeline/image/s390x.yaml
@@ -3,7 +3,7 @@ build: name:build
 stages:
   otk.op.join:
     values:
-      - otk.external.otk-make-partition-stages:
+      - otk.external.osbuild-make-partition-stages:
           ${filesystem}
       - - type: org.osbuild.copy
           inputs:
diff --git a/example/centos/pipeline/image/x86_64-no-bios.yaml b/example/centos/pipeline/image/x86_64-no-bios.yaml
index 95a204c2..0750655b 100644
--- a/example/centos/pipeline/image/x86_64-no-bios.yaml
+++ b/example/centos/pipeline/image/x86_64-no-bios.yaml
@@ -3,7 +3,7 @@ build: name:build
 stages:
   otk.op.join:
     values:
-      - otk.external.otk-make-partition-stages:
+      - otk.external.osbuild-make-partition-stages:
           ${filesystem}
       - - type: org.osbuild.copy
           inputs:
diff --git a/example/centos/pipeline/image/x86_64.yaml b/example/centos/pipeline/image/x86_64.yaml
index 6f32139e..f58d127a 100644
--- a/example/centos/pipeline/image/x86_64.yaml
+++ b/example/centos/pipeline/image/x86_64.yaml
@@ -3,7 +3,7 @@ build: name:build
 stages:
   otk.op.join:
     values:
-      - otk.external.otk-make-partition-stages:
+      - otk.external.osbuild-make-partition-stages:
           ${filesystem}
       - - type: org.osbuild.copy
           inputs:
@@ -21,6 +21,6 @@ stages:
           mounts:
             ${fs_options.mounts}
         # XXX conditional
-        - otk.external.otk-make-grub2-inst-stage:
+        - otk.external.osbuild-make-grub2-inst-stage:
             platform: i386-pc
             filesystem: ${filesystem}