diff --git a/libs/web-components/src/components/form/SubForm.svelte b/libs/web-components/src/components/form/SubForm.svelte
index 310aaeeab..37784215e 100644
--- a/libs/web-components/src/components/form/SubForm.svelte
+++ b/libs/web-components/src/components/form/SubForm.svelte
@@ -1,5 +1,5 @@
 <svelte:options customElement={{
-  tag: "goa-subform",
+  tag: "goa-public-subform",
   props: {
     continueMsg: { attribute: "continue-msg", type: "String" }
   }
@@ -89,7 +89,7 @@
   function bindWithSubformIndex() {
     setTimeout(() => {
       const el = document
-        .querySelector("goa-subform-index")
+        .querySelector("goa-public-subform-index")
         .shadowRoot
         .querySelector("[data-bind]") as HTMLElement;
       relay<SubFormBindRelayDetail>(el, SubFormBindMsg, { el: _receiverEl});
diff --git a/libs/web-components/src/components/form/SubFormIndex.svelte b/libs/web-components/src/components/form/SubFormIndex.svelte
index 0fc989023..e38ef92f7 100644
--- a/libs/web-components/src/components/form/SubFormIndex.svelte
+++ b/libs/web-components/src/components/form/SubFormIndex.svelte
@@ -1,5 +1,5 @@
 <svelte:options customElement={{
-  tag: "goa-subform-index",
+  tag: "goa-public-subform-index",
   props: {
     actionButtonText: { type: "String", attribute: "action-button-text" },
     continueButtonText: { type: "String", attribute: "continue-button-text" },