diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 04ce6c56b..9397e7d2a 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -467,7 +467,7 @@ export default {
     },
     computed: {
         defaultPT() {
-            return this._getOptionValue(this.$primevue.config.pt, this.$.type.name, { instance: this });
+            return this._getOptionValue(this.$primevue.config.pt, this.$options.hostName || this.$.type.name, { instance: this });
         },
         isUnstyled() {
             return this.unstyled !== undefined ? this.unstyled : this.$primevue.config.unstyled;
diff --git a/components/lib/breadcrumb/BreadcrumbItem.vue b/components/lib/breadcrumb/BreadcrumbItem.vue
index bae64ad74..f86d635dd 100755
--- a/components/lib/breadcrumb/BreadcrumbItem.vue
+++ b/components/lib/breadcrumb/BreadcrumbItem.vue
@@ -23,6 +23,7 @@ import BaseComponent from 'primevue/basecomponent';
 
 export default {
     name: 'BreadcrumbItem',
+    hostName: 'Breadcrumb',
     extends: BaseComponent,
     props: {
         item: null,
diff --git a/components/lib/cascadeselect/CascadeSelectSub.vue b/components/lib/cascadeselect/CascadeSelectSub.vue
index 87fb71048..b234cec5a 100644
--- a/components/lib/cascadeselect/CascadeSelectSub.vue
+++ b/components/lib/cascadeselect/CascadeSelectSub.vue
@@ -58,6 +58,7 @@ import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'CascadeSelectSub',
+    hostName: 'CascadeSelect',
     extends: BaseComponent,
     emits: ['option-change'],
     props: {
diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue
index 58f1600b3..19ec44486 100755
--- a/components/lib/contextmenu/ContextMenuSub.vue
+++ b/components/lib/contextmenu/ContextMenuSub.vue
@@ -81,6 +81,7 @@ import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'ContextMenuSub',
+    hostName: 'ContextMenu',
     extends: BaseComponent,
     emits: ['item-click', 'item-mouseenter'],
     props: {
diff --git a/components/lib/dock/DockSub.vue b/components/lib/dock/DockSub.vue
index c15bae93b..44151d62e 100644
--- a/components/lib/dock/DockSub.vue
+++ b/components/lib/dock/DockSub.vue
@@ -80,6 +80,7 @@ import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 
 export default {
     name: 'DockSub',
+    hostName: 'Dock',
     extends: BaseComponent,
     emits: ['focus', 'blur'],
     props: {
diff --git a/components/lib/fileupload/FileContent.vue b/components/lib/fileupload/FileContent.vue
index 066835b47..1b9f72de1 100644
--- a/components/lib/fileupload/FileContent.vue
+++ b/components/lib/fileupload/FileContent.vue
@@ -25,6 +25,7 @@ import TimesIcon from 'primevue/icons/times';
 
 export default {
     name: 'FileContent',
+    hostName: 'FileUpload',
     extends: BaseComponent,
     emits: ['remove'],
     props: {
diff --git a/components/lib/megamenu/MegaMenuSub.vue b/components/lib/megamenu/MegaMenuSub.vue
index 6e2898457..d972626b1 100644
--- a/components/lib/megamenu/MegaMenuSub.vue
+++ b/components/lib/megamenu/MegaMenuSub.vue
@@ -86,6 +86,7 @@ import { ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'MegaMenuSub',
+    hostName: 'MegaMenu',
     extends: BaseComponent,
     emits: ['item-click', 'item-mouseenter'],
     props: {
diff --git a/components/lib/menu/Menuitem.vue b/components/lib/menu/Menuitem.vue
index f8842586d..241f6958d 100644
--- a/components/lib/menu/Menuitem.vue
+++ b/components/lib/menu/Menuitem.vue
@@ -38,6 +38,7 @@ import { ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'Menuitem',
+    hostName: 'Menu',
     extends: BaseComponent,
     inheritAttrs: false,
     emits: ['item-click'],
diff --git a/components/lib/menubar/MenubarSub.vue b/components/lib/menubar/MenubarSub.vue
index 331f002ec..76dc2d737 100755
--- a/components/lib/menubar/MenubarSub.vue
+++ b/components/lib/menubar/MenubarSub.vue
@@ -78,6 +78,7 @@ import { ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'MenubarSub',
+    hostName: 'Menubar',
     extends: BaseComponent,
     emits: ['item-mouseenter', 'item-click'],
     props: {
diff --git a/components/lib/organizationchart/OrganizationChartNode.vue b/components/lib/organizationchart/OrganizationChartNode.vue
index 75866412b..7b1481d6d 100755
--- a/components/lib/organizationchart/OrganizationChartNode.vue
+++ b/components/lib/organizationchart/OrganizationChartNode.vue
@@ -76,6 +76,7 @@ import { DomHandler } from 'primevue/utils';
 
 export default {
     name: 'OrganizationChartNode',
+    hostName: 'OrganizationChart',
     extends: BaseComponent,
     emits: ['node-click', 'node-toggle'],
     props: {
diff --git a/components/lib/paginator/CurrentPageReport.vue b/components/lib/paginator/CurrentPageReport.vue
index 8be272bab..688399c30 100755
--- a/components/lib/paginator/CurrentPageReport.vue
+++ b/components/lib/paginator/CurrentPageReport.vue
@@ -7,6 +7,7 @@ import BaseComponent from 'primevue/basecomponent';
 
 export default {
     name: 'CurrentPageReport',
+    hostName: 'Paginator',
     extends: BaseComponent,
     props: {
         pageCount: {
diff --git a/components/lib/paginator/FirstPageLink.vue b/components/lib/paginator/FirstPageLink.vue
index f7022e2c9..d83cbcf26 100755
--- a/components/lib/paginator/FirstPageLink.vue
+++ b/components/lib/paginator/FirstPageLink.vue
@@ -11,6 +11,7 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'FirstPageLink',
+    hostName: 'Paginator',
     extends: BaseComponent,
     props: {
         template: {
diff --git a/components/lib/paginator/JumpToPageDropdown.vue b/components/lib/paginator/JumpToPageDropdown.vue
index 5369cf134..c98f37c84 100644
--- a/components/lib/paginator/JumpToPageDropdown.vue
+++ b/components/lib/paginator/JumpToPageDropdown.vue
@@ -19,6 +19,7 @@ import Dropdown from 'primevue/dropdown';
 
 export default {
     name: 'JumpToPageDropdown',
+    hostName: 'Paginator',
     extends: BaseComponent,
     emits: ['page-change'],
     props: {
diff --git a/components/lib/paginator/JumpToPageInput.vue b/components/lib/paginator/JumpToPageInput.vue
index 22161ec77..7cdd9ebfd 100644
--- a/components/lib/paginator/JumpToPageInput.vue
+++ b/components/lib/paginator/JumpToPageInput.vue
@@ -18,6 +18,7 @@ import InputNumber from 'primevue/inputnumber';
 
 export default {
     name: 'JumpToPageInput',
+    hostName: 'Paginator',
     extends: BaseComponent,
     inheritAttrs: false,
     emits: ['page-change'],
diff --git a/components/lib/paginator/LastPageLink.vue b/components/lib/paginator/LastPageLink.vue
index 4e9bba8a3..4b8f84ec1 100755
--- a/components/lib/paginator/LastPageLink.vue
+++ b/components/lib/paginator/LastPageLink.vue
@@ -11,6 +11,7 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'LastPageLink',
+    hostName: 'Paginator',
     extends: BaseComponent,
     props: {
         template: {
diff --git a/components/lib/paginator/NextPageLink.vue b/components/lib/paginator/NextPageLink.vue
index d6fff62ee..4fbc5430a 100755
--- a/components/lib/paginator/NextPageLink.vue
+++ b/components/lib/paginator/NextPageLink.vue
@@ -11,6 +11,7 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'NextPageLink',
+    hostName: 'Paginator',
     extends: BaseComponent,
     props: {
         template: {
diff --git a/components/lib/paginator/PageLinks.vue b/components/lib/paginator/PageLinks.vue
index 9f093d176..ade23189a 100755
--- a/components/lib/paginator/PageLinks.vue
+++ b/components/lib/paginator/PageLinks.vue
@@ -23,6 +23,7 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'PageLinks',
+    hostName: 'Paginator',
     extends: BaseComponent,
     inheritAttrs: false,
     emits: ['click'],
diff --git a/components/lib/paginator/PrevPageLink.vue b/components/lib/paginator/PrevPageLink.vue
index a979c313b..2519d2d87 100755
--- a/components/lib/paginator/PrevPageLink.vue
+++ b/components/lib/paginator/PrevPageLink.vue
@@ -11,6 +11,7 @@ import Ripple from 'primevue/ripple';
 
 export default {
     name: 'PrevPageLink',
+    hostName: 'Paginator',
     extends: BaseComponent,
     props: {
         template: {
diff --git a/components/lib/paginator/RowsPerPageDropdown.vue b/components/lib/paginator/RowsPerPageDropdown.vue
index 5ded690b4..b655dc78f 100755
--- a/components/lib/paginator/RowsPerPageDropdown.vue
+++ b/components/lib/paginator/RowsPerPageDropdown.vue
@@ -19,6 +19,7 @@ import Dropdown from 'primevue/dropdown';
 
 export default {
     name: 'RowsPerPageDropdown',
+    hostName: 'Paginator',
     extends: BaseComponent,
     emits: ['rows-change'],
     props: {
diff --git a/components/lib/panelmenu/PanelMenuList.vue b/components/lib/panelmenu/PanelMenuList.vue
index f68315812..52d6548af 100644
--- a/components/lib/panelmenu/PanelMenuList.vue
+++ b/components/lib/panelmenu/PanelMenuList.vue
@@ -27,6 +27,7 @@ import PanelMenuSub from './PanelMenuSub.vue';
 
 export default {
     name: 'PanelMenuList',
+    hostName: 'PanelMenu',
     extends: BaseComponent,
     emits: ['item-toggle', 'header-focus'],
     props: {
diff --git a/components/lib/panelmenu/PanelMenuSub.vue b/components/lib/panelmenu/PanelMenuSub.vue
index c8f0d5981..e64324f11 100755
--- a/components/lib/panelmenu/PanelMenuSub.vue
+++ b/components/lib/panelmenu/PanelMenuSub.vue
@@ -77,6 +77,7 @@ import { ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'PanelMenuSub',
+    hostName: 'PanelMenu',
     extends: BaseComponent,
     emits: ['item-toggle'],
     props: {
diff --git a/components/lib/tieredmenu/TieredMenuSub.vue b/components/lib/tieredmenu/TieredMenuSub.vue
index b3a7a7a80..0c85a83c8 100755
--- a/components/lib/tieredmenu/TieredMenuSub.vue
+++ b/components/lib/tieredmenu/TieredMenuSub.vue
@@ -77,6 +77,7 @@ import { ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'TieredMenuSub',
+    hostName: 'TieredMenu',
     extends: BaseComponent,
     emits: ['item-click', 'item-mouseenter'],
     props: {
diff --git a/components/lib/tree/TreeNode.vue b/components/lib/tree/TreeNode.vue
index a8392f912..4eac6d06a 100755
--- a/components/lib/tree/TreeNode.vue
+++ b/components/lib/tree/TreeNode.vue
@@ -62,6 +62,7 @@ import { DomHandler } from 'primevue/utils';
 
 export default {
     name: 'TreeNode',
+    hostName: 'Tree',
     extends: BaseComponent,
     emits: ['node-toggle', 'node-click', 'checkbox-change'],
     props: {
diff --git a/components/lib/treetable/BodyCell.vue b/components/lib/treetable/BodyCell.vue
index ddf61419e..5999f4515 100644
--- a/components/lib/treetable/BodyCell.vue
+++ b/components/lib/treetable/BodyCell.vue
@@ -32,6 +32,7 @@ import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'BodyCell',
+    hostName: 'TreeTable',
     extends: BaseComponent,
     emits: ['node-toggle', 'checkbox-toggle'],
     props: {
diff --git a/components/lib/treetable/FooterCell.vue b/components/lib/treetable/FooterCell.vue
index 7708f9bfa..32038b550 100644
--- a/components/lib/treetable/FooterCell.vue
+++ b/components/lib/treetable/FooterCell.vue
@@ -11,6 +11,7 @@ import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'FooterCell',
+    hostName: 'TreeTable',
     extends: BaseComponent,
     props: {
         column: {
diff --git a/components/lib/treetable/HeaderCell.vue b/components/lib/treetable/HeaderCell.vue
index e2a094c83..2cbcaad91 100644
--- a/components/lib/treetable/HeaderCell.vue
+++ b/components/lib/treetable/HeaderCell.vue
@@ -32,6 +32,7 @@ import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
     name: 'HeaderCell',
+    hostName: 'TreeTable',
     extends: BaseComponent,
     emits: ['column-click', 'column-resizestart'],
     props: {
diff --git a/components/lib/treetable/TreeTableRow.vue b/components/lib/treetable/TreeTableRow.vue
index a2e8456b3..d98c53cc4 100755
--- a/components/lib/treetable/TreeTableRow.vue
+++ b/components/lib/treetable/TreeTableRow.vue
@@ -67,6 +67,7 @@ import BodyCell from './BodyCell.vue';
 
 export default {
     name: 'TreeTableRow',
+    hostName: 'TreeTable',
     extends: BaseComponent,
     emits: ['node-click', 'node-toggle', 'checkbox-change', 'nodeClick', 'nodeToggle', 'checkboxChange'],
     props: {