diff --git a/apps/showcase/doc/common/apidoc/index.json b/apps/showcase/doc/common/apidoc/index.json
index 9f94cb3a0..33f42c06a 100644
--- a/apps/showcase/doc/common/apidoc/index.json
+++ b/apps/showcase/doc/common/apidoc/index.json
@@ -4367,7 +4367,7 @@
             "methodDescription": "Defines methods that can be accessed by the component's reference.",
             "typeDescription": "Defines the custom types used by the module.",
             "values": {
-                "BadgePassThroughMethodOptions": {
+                "BadgeDirectivePassThroughMethodOptions": {
                     "description": "Custom passthrough(pt) option method.",
                     "relatedProp": "",
                     "props": [
@@ -4603,7 +4603,7 @@
         "tokens": {
             "description": "Define design tokens used by the component.",
             "values": {
-                "BadgePassThroughMethodOptions": {
+                "BadgeDirectivePassThroughMethodOptions": {
                     "description": "Custom passthrough(pt) option method.",
                     "props": []
                 },
@@ -4637,7 +4637,7 @@
             "description": "Defines the custom types used by the module.",
             "values": {
                 "BadgeDirectivePassThroughOptionType": {
-                    "values": "BadgeDirectivePassThroughAttributes | (options: BadgePassThroughMethodOptions) => BadgeDirectivePassThroughAttributes | null | undefined"
+                    "values": "BadgeDirectivePassThroughAttributes | (options: BadgeDirectivePassThroughMethodOptions) => BadgeDirectivePassThroughAttributes | null | undefined"
                 }
             }
         }
@@ -31421,6 +31421,7 @@
             }
         }
     },
+    "primevue/src": {},
     "inlinemessage": {
         "description": "InlineMessage component is useful in cases where a single message needs to be displayed related to an element such as forms. It has one property, severity of the message.\n\n[Live Demo](https://www.primevue.org/inlinemessage/)",
         "components": {
diff --git a/apps/showcase/tsconfig.json b/apps/showcase/tsconfig.json
index fc9083beb..cdc32c338 100644
--- a/apps/showcase/tsconfig.json
+++ b/apps/showcase/tsconfig.json
@@ -20,9 +20,9 @@
         "../../packages/primevue/src/**/style/*.d.ts",
         "../../packages/themes/types",
         "../packages/themes/src/**/**/index.js",
-        "../packages/form/src/**/*.d.ts",
-        "../../packages/form/src/**/*.d.ts",
-        "../../packages/form/src/**/style/*.d.ts"
+        "../packages/forms/src/**/*.d.ts",
+        "../../packages/forms/src/**/*.d.ts",
+        "../../packages/forms/src/**/style/*.d.ts"
     ],
     "exclude": ["node_modules", "**/node_modules", "**/dist"]
 }
diff --git a/apps/showcase/typedoc.json b/apps/showcase/typedoc.json
index a5306e0d3..017cb7c6a 100644
--- a/apps/showcase/typedoc.json
+++ b/apps/showcase/typedoc.json
@@ -1,5 +1,5 @@
 {
     "$schema": "https://typedoc.org/schema.json",
-    "entryPoints": ["../../packages/primevue", "../../packages/themes", "../../packages/form"],
+    "entryPoints": ["../../packages/primevue", "../../packages/themes", "../../packages/forms"],
     "sort": ["source-order"]
 }
diff --git a/packages/forms/src/form/Form.d.ts b/packages/forms/src/form/Form.d.ts
index b36e59754..e1d5f2e04 100644
--- a/packages/forms/src/form/Form.d.ts
+++ b/packages/forms/src/form/Form.d.ts
@@ -2,7 +2,7 @@
  *
  * Form provides validation functionality and manages form state.
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  *
  * @module form
  *
@@ -263,7 +263,7 @@ export declare type FormEmits = EmitFn<FormEmitsOptions>;
  *
  * _Form provides validation functionality and manages form state._
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  * --- ---
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
diff --git a/packages/forms/src/form/style/FormStyle.d.ts b/packages/forms/src/form/style/FormStyle.d.ts
index 0dc31123a..32880a222 100644
--- a/packages/forms/src/form/style/FormStyle.d.ts
+++ b/packages/forms/src/form/style/FormStyle.d.ts
@@ -1,6 +1,6 @@
 /**
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  *
  * @module formstyle
  *
diff --git a/packages/forms/src/formfield/FormField.d.ts b/packages/forms/src/formfield/FormField.d.ts
index 6b6da9514..5b9d89943 100644
--- a/packages/forms/src/formfield/FormField.d.ts
+++ b/packages/forms/src/formfield/FormField.d.ts
@@ -2,7 +2,7 @@
  *
  * FormField is a helper component that provides validation and tracking for form fields.
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  *
  * @module formfield
  */
@@ -211,7 +211,7 @@ export declare type FormEmits = EmitFn<FormFieldEmitsOptions>;
  *
  * _FormField is a helper component that provides validation and tracking for form fields._
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  * --- ---
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
diff --git a/packages/forms/src/formfield/style/FormFieldStyle.d.ts b/packages/forms/src/formfield/style/FormFieldStyle.d.ts
index bde56e8c3..5f3850a96 100644
--- a/packages/forms/src/formfield/style/FormFieldStyle.d.ts
+++ b/packages/forms/src/formfield/style/FormFieldStyle.d.ts
@@ -1,6 +1,6 @@
 /**
  *
- * [Live Demo](https://www.primevue.org/form/)
+ * [Live Demo](https://www.primevue.org/forms/)
  *
  * @module formfieldstyle
  *