From 476d9f31f8beed55a59a58d2a34712a97ab8da9f Mon Sep 17 00:00:00 2001
From: Jack Mason <jack.mason1@ibm.com>
Date: Fri, 2 Oct 2020 15:48:00 +0100
Subject: [PATCH 1/2] feat(mixins): add index for mixins and simplify imports

---
 .../cv-accordion/_cv-accordion-item-skeleton.vue     |  2 +-
 .../components/cv-accordion/cv-accordion-item.vue    |  5 +----
 .../cv-accordion/cv-accordion-skeleton.vue           |  2 +-
 .../src/components/cv-accordion/cv-accordion.vue     |  2 +-
 .../cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue   |  2 +-
 .../components/cv-breadcrumb/cv-breadcrumb-item.vue  |  2 +-
 .../cv-breadcrumb/cv-breadcrumb-skeleton.vue         |  2 +-
 .../src/components/cv-breadcrumb/cv-breadcrumb.vue   |  2 +-
 .../core/src/components/cv-button/cv-button-set.vue  |  2 +-
 packages/core/src/components/cv-button/cv-button.vue |  2 +-
 .../core/src/components/cv-button/cv-icon-button.vue |  2 +-
 .../components/cv-checkbox/cv-checkbox-skeleton.vue  |  2 +-
 .../core/src/components/cv-checkbox/cv-checkbox.vue  |  5 +----
 .../cv-code-snippet/_cv-code-snippet-inline.vue      |  3 +--
 .../cv-code-snippet/_cv-code-snippet-multiline.vue   |  3 +--
 .../cv-code-snippet/_cv-code-snippet-oneline.vue     |  3 +--
 .../cv-code-snippet/cv-code-snippet-skeleton.vue     |  2 +-
 .../src/components/cv-combo-box/cv-combo-box.vue     |  5 +----
 .../cv-content-switcher-button.vue                   |  3 +--
 .../cv-content-switcher/cv-content-switcher.vue      |  2 +-
 .../cv-data-table/_cv-data-table-row-inner.vue       |  2 +-
 .../cv-data-table/cv-data-table-action.vue           |  2 +-
 .../cv-data-table/cv-data-table-heading.vue          |  3 +--
 .../components/cv-data-table/cv-data-table-row.vue   |  3 +--
 .../src/components/cv-data-table/cv-data-table.vue   |  4 +---
 .../src/components/cv-date-picker/cv-date-picker.vue |  4 +---
 .../src/components/cv-dropdown/cv-dropdown-item.vue  |  2 +-
 .../components/cv-dropdown/cv-dropdown-skeleton.vue  |  2 +-
 .../core/src/components/cv-dropdown/cv-dropdown.vue  |  5 +----
 .../cv-feedback-button/_cv-feedback-button.vue       |  2 +-
 .../cv-file-uploader/cv-file-uploader-skeleton.vue   |  2 +-
 .../components/cv-file-uploader/cv-file-uploader.vue |  4 +---
 .../core/src/components/cv-form/cv-form-group.vue    |  2 +-
 .../core/src/components/cv-form/cv-form-item.vue     |  2 +-
 packages/core/src/components/cv-form/cv-form.vue     |  2 +-
 .../cv-inline-loading/cv-inline-loading.vue          |  2 +-
 .../cv-inline-notification.vue                       |  3 +--
 packages/core/src/components/cv-link/cv-link.vue     |  3 +--
 .../core/src/components/cv-list/cv-list-item.vue     |  2 +-
 packages/core/src/components/cv-list/cv-list.vue     |  2 +-
 .../core/src/components/cv-loading/cv-loading.vue    |  2 +-
 packages/core/src/components/cv-modal/cv-modal.vue   |  3 +--
 .../components/cv-multi-select/cv-multi-select.vue   |  5 +----
 .../cv-number-input/cv-number-input-skeleton.vue     |  2 +-
 .../components/cv-number-input/cv-number-input.vue   |  5 +----
 .../cv-overflow-menu/cv-overflow-menu-item.vue       |  2 +-
 .../components/cv-overflow-menu/cv-overflow-menu.vue |  4 +---
 .../src/components/cv-pagination/cv-pagination.vue   |  2 +-
 .../src/components/cv-progress/cv-progress-step.vue  |  2 +-
 .../core/src/components/cv-progress/cv-progress.vue  |  2 +-
 .../components/cv-radio-button/cv-radio-button.vue   |  5 +----
 .../components/cv-radio-button/cv-radio-group.vue    |  2 +-
 packages/core/src/components/cv-search/cv-search.vue |  5 +----
 .../src/components/cv-select/cv-select-optgroup.vue  |  2 +-
 .../src/components/cv-select/cv-select-option.vue    |  2 +-
 packages/core/src/components/cv-select/cv-select.vue |  5 +----
 .../components/cv-skeleton-text/cv-skeleton-text.vue |  2 +-
 .../src/components/cv-slider/cv-slider-skeleton.vue  |  2 +-
 packages/core/src/components/cv-slider/cv-slider.vue |  5 +----
 .../_cv-structured-list-item-selectable.vue          |  5 +----
 .../_cv-structured-list-item-standard.vue            |  2 +-
 .../cv-structured-list/cv-structured-list-data.vue   |  2 +-
 .../cv-structured-list-heading.vue                   |  2 +-
 .../cv-structured-list/cv-structured-list.vue        |  2 +-
 packages/core/src/components/cv-tabs/cv-tab.vue      |  2 +-
 .../core/src/components/cv-tabs/cv-tabs-skeleton.vue |  2 +-
 packages/core/src/components/cv-tabs/cv-tabs.vue     |  2 +-
 .../core/src/components/cv-tag/cv-tag-skeleton.vue   |  2 +-
 packages/core/src/components/cv-tag/cv-tag.vue       |  2 +-
 .../src/components/cv-text-area/cv-text-area.vue     |  5 +----
 .../src/components/cv-text-input/cv-text-input.vue   |  5 +----
 .../src/components/cv-tile/_cv-tile-clickable.vue    |  4 +---
 .../src/components/cv-tile/_cv-tile-expandable.vue   |  3 +--
 .../src/components/cv-tile/_cv-tile-selectable.vue   |  5 +----
 packages/core/src/components/cv-tile/cv-tile.vue     |  4 +---
 .../src/components/cv-time-picker/cv-time-picker.vue |  5 +----
 .../cv-toast-notification/cv-toast-notification.vue  |  3 +--
 .../src/components/cv-toggle/cv-toggle-skeleton.vue  |  3 +--
 packages/core/src/components/cv-toggle/cv-toggle.vue |  5 +----
 .../src/components/cv-toolbar/cv-toolbar-divider.vue |  2 +-
 .../src/components/cv-toolbar/cv-toolbar-option.vue  |  2 +-
 .../src/components/cv-toolbar/cv-toolbar-search.vue  |  2 +-
 .../src/components/cv-toolbar/cv-toolbar-title.vue   |  2 +-
 .../core/src/components/cv-toolbar/cv-toolbar.vue    |  2 +-
 .../components/cv-tooltip/cv-definition-tooltip.vue  |  3 +--
 .../components/cv-tooltip/cv-interactive-tooltip.vue |  3 +--
 .../core/src/components/cv-tooltip/cv-tooltip.vue    |  2 +-
 .../components/cv-ui-shell/_cv-side-nav-footer.vue   |  2 +-
 .../cv-ui-shell/_cv-side-nav-link-text.vue           |  2 +-
 .../core/src/components/cv-ui-shell/cv-content.vue   |  2 +-
 .../cv-ui-shell/cv-header-global-action.vue          |  3 +--
 .../components/cv-ui-shell/cv-header-menu-button.vue |  3 +--
 .../components/cv-ui-shell/cv-header-menu-item.vue   |  3 +--
 .../src/components/cv-ui-shell/cv-header-menu.vue    |  2 +-
 .../src/components/cv-ui-shell/cv-header-name.vue    |  3 +--
 .../src/components/cv-ui-shell/cv-header-nav.vue     |  2 +-
 .../src/components/cv-ui-shell/cv-header-panel.vue   |  2 +-
 .../cv-ui-shell/cv-header-side-nav-items.vue         |  2 +-
 .../core/src/components/cv-ui-shell/cv-header.vue    |  2 +-
 .../src/components/cv-ui-shell/cv-side-nav-icon.vue  |  2 +-
 .../src/components/cv-ui-shell/cv-side-nav-items.vue |  2 +-
 .../src/components/cv-ui-shell/cv-side-nav-link.vue  |  3 +--
 .../components/cv-ui-shell/cv-side-nav-menu-item.vue |  3 +--
 .../src/components/cv-ui-shell/cv-side-nav-menu.vue  |  2 +-
 .../core/src/components/cv-ui-shell/cv-side-nav.vue  |  2 +-
 .../components/cv-ui-shell/cv-skip-to-content.vue    |  3 +--
 .../components/cv-ui-shell/cv-switcher-item-link.vue |  3 +--
 .../src/components/cv-ui-shell/cv-switcher-item.vue  |  2 +-
 .../core/src/components/cv-ui-shell/cv-switcher.vue  |  2 +-
 packages/core/src/mixins/index.js                    | 12 ++++++++++++
 110 files changed, 121 insertions(+), 191 deletions(-)
 create mode 100644 packages/core/src/mixins/index.js

diff --git a/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue b/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue
index 374e5c334..61915697b 100644
--- a/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue
+++ b/packages/core/src/components/cv-accordion/_cv-accordion-item-skeleton.vue
@@ -13,7 +13,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordionItemSkeleton',
diff --git a/packages/core/src/components/cv-accordion/cv-accordion-item.vue b/packages/core/src/components/cv-accordion/cv-accordion-item.vue
index 6f0ef0b8c..a4213a4ed 100644
--- a/packages/core/src/components/cv-accordion/cv-accordion-item.vue
+++ b/packages/core/src/components/cv-accordion/cv-accordion-item.vue
@@ -39,10 +39,7 @@
 
 <script>
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
-
+import { uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 export default {
   name: 'CvAccordionItem',
   mixins: [uidMixin, carbonPrefixMixin, methodsMixin({ button: ['blur', 'focus'] })],
diff --git a/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue b/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue
index 2385ceea2..81352744a 100644
--- a/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue
+++ b/packages/core/src/components/cv-accordion/cv-accordion-skeleton.vue
@@ -14,7 +14,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import CvAccordionItemSkeleton from './_cv-accordion-item-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordionSkeleton',
diff --git a/packages/core/src/components/cv-accordion/cv-accordion.vue b/packages/core/src/components/cv-accordion/cv-accordion.vue
index 8d9ce91e4..65e7c6cd1 100644
--- a/packages/core/src/components/cv-accordion/cv-accordion.vue
+++ b/packages/core/src/components/cv-accordion/cv-accordion.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvAccordion',
diff --git a/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue b/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue
index 939cddee4..fbb09d174 100644
--- a/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue
+++ b/packages/core/src/components/cv-breadcrumb/_cv-breadcrumb-item-skeleton.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumbItemSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue
index 8db78158f..06d4fb287 100644
--- a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue
+++ b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-item.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumbItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue
index 7abb6a7e6..744447bcb 100644
--- a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue
+++ b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb-skeleton.vue
@@ -8,7 +8,7 @@
 
 <script>
 import CvBreadcrumbItemSkeleton from './_cv-breadcrumb-item-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvBreadcrumbSkeleton',
diff --git a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue
index 98ec07981..4b3496295 100644
--- a/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue
+++ b/packages/core/src/components/cv-breadcrumb/cv-breadcrumb.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvBreadcrumb',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-button/cv-button-set.vue b/packages/core/src/components/cv-button/cv-button-set.vue
index 98b3d99c3..da0482051 100644
--- a/packages/core/src/components/cv-button/cv-button-set.vue
+++ b/packages/core/src/components/cv-button/cv-button-set.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvButtonSet',
diff --git a/packages/core/src/components/cv-button/cv-button.vue b/packages/core/src/components/cv-button/cv-button.vue
index 6ca85c572..aca3f1470 100644
--- a/packages/core/src/components/cv-button/cv-button.vue
+++ b/packages/core/src/components/cv-button/cv-button.vue
@@ -8,7 +8,7 @@
 
 <script>
 import buttonMixin from './button-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
 
 export default {
diff --git a/packages/core/src/components/cv-button/cv-icon-button.vue b/packages/core/src/components/cv-button/cv-icon-button.vue
index d6b058931..e5e87f51d 100644
--- a/packages/core/src/components/cv-button/cv-icon-button.vue
+++ b/packages/core/src/components/cv-button/cv-icon-button.vue
@@ -19,7 +19,7 @@
 
 <script>
 import buttonMixin from './button-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
 
 export default {
diff --git a/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue b/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue
index 7d89f9516..80857bd8b 100644
--- a/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue
+++ b/packages/core/src/components/cv-checkbox/cv-checkbox-skeleton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvCheckboxSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-checkbox/cv-checkbox.vue b/packages/core/src/components/cv-checkbox/cv-checkbox.vue
index b94a95773..cda8bb187 100644
--- a/packages/core/src/components/cv-checkbox/cv-checkbox.vue
+++ b/packages/core/src/components/cv-checkbox/cv-checkbox.vue
@@ -33,10 +33,7 @@
 </template>
 
 <script>
-import checkMixin from '../../mixins/check-mixin';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { checkMixin, uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvCheckbox',
diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue
index e49b4c9a8..70ea00d95 100644
--- a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue
+++ b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-inline.vue
@@ -17,8 +17,7 @@
 
 <script>
 import CvFeedbackButton from '../cv-feedback-button/_cv-feedback-button';
-import themeMixin from '../../mixins/theme-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { themeMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetInline',
diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue
index 19b50a5f1..a9898767d 100644
--- a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue
+++ b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-multiline.vue
@@ -36,8 +36,7 @@ import CvButton from '../cv-button/cv-button';
 
 import Copy16 from '@carbon/icons-vue/es/copy/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { carbonPrefixMixin, themeMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetMultiline',
diff --git a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue
index 556f87699..97b0e1040 100644
--- a/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue
+++ b/packages/core/src/components/cv-code-snippet/_cv-code-snippet-oneline.vue
@@ -19,8 +19,7 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { themeMixin, carbonPrefixMixin } from '../../mixins';
 import CvFeedbackButton from '../cv-feedback-button/_cv-feedback-button';
 import Copy16 from '@carbon/icons-vue/es/copy/16';
 
diff --git a/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue b/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue
index aba93f1b4..d08ac937a 100644
--- a/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue
+++ b/packages/core/src/components/cv-code-snippet/cv-code-snippet-skeleton.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvCodeSnippetSkeleton',
diff --git a/packages/core/src/components/cv-combo-box/cv-combo-box.vue b/packages/core/src/components/cv-combo-box/cv-combo-box.vue
index 5dd4a7ab5..c6de95757 100644
--- a/packages/core/src/components/cv-combo-box/cv-combo-box.vue
+++ b/packages/core/src/components/cv-combo-box/cv-combo-box.vue
@@ -113,13 +113,10 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
+import { themeMixin, uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvComboBox',
diff --git a/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue b/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
index 14958d4bf..738136d36 100644
--- a/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
+++ b/packages/core/src/components/cv-content-switcher/cv-content-switcher-button.vue
@@ -34,9 +34,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import CvSvg from '../cv-svg/_cv-svg';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvContentSwitcherButton',
diff --git a/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue b/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue
index 25a2ed19f..0ab0786ec 100644
--- a/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue
+++ b/packages/core/src/components/cv-content-switcher/cv-content-switcher.vue
@@ -6,7 +6,7 @@
 
 <script>
 import store from './cv-content-switcher-store';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 const toggleContent = (selector, on) => {
   // hide content
diff --git a/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue b/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue
index b2e3fa8b9..3672d9d01 100644
--- a/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue
+++ b/packages/core/src/components/cv-data-table/_cv-data-table-row-inner.vue
@@ -54,7 +54,7 @@ import CvCheckbox from '../cv-checkbox/cv-checkbox';
 import CvOverflowMenu from '../cv-overflow-menu/cv-overflow-menu';
 import CvOverflowMenuItem from '../cv-overflow-menu/cv-overflow-menu-item';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvDataTableRowInner',
diff --git a/packages/core/src/components/cv-data-table/cv-data-table-action.vue b/packages/core/src/components/cv-data-table/cv-data-table-action.vue
index 2c2a8443d..0378e114d 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table-action.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table-action.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'cv-data-table-action',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-data-table/cv-data-table-heading.vue b/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
index ada9689ca..8f1bcff08 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table-heading.vue
@@ -30,8 +30,7 @@
 import ArrowDown16 from '@carbon/icons-vue/es/arrow--down/16';
 import Arrows16 from '@carbon/icons-vue/es/arrows/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 const nextOrder = {
   ascending: 'descending',
diff --git a/packages/core/src/components/cv-data-table/cv-data-table-row.vue b/packages/core/src/components/cv-data-table/cv-data-table-row.vue
index 9aabf404b..86d2f66c1 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table-row.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table-row.vue
@@ -30,8 +30,7 @@
 
 <script>
 import CvDataTableRowInner from './_cv-data-table-row-inner';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvDataTableRow',
diff --git a/packages/core/src/components/cv-data-table/cv-data-table.vue b/packages/core/src/components/cv-data-table/cv-data-table.vue
index fdd4b57a9..3e095ba6f 100644
--- a/packages/core/src/components/cv-data-table/cv-data-table.vue
+++ b/packages/core/src/components/cv-data-table/cv-data-table.vue
@@ -187,12 +187,10 @@ import CvButton from '../cv-button/cv-button';
 import CvCheckbox from '../cv-checkbox/cv-checkbox';
 import CvPagination from '../cv-pagination/cv-pagination';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import Search16 from '@carbon/icons-vue/es/search/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
 import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-
 export default {
   name: 'CvDataTable',
   components: {
diff --git a/packages/core/src/components/cv-date-picker/cv-date-picker.vue b/packages/core/src/components/cv-date-picker/cv-date-picker.vue
index 87846770c..d2feb509a 100644
--- a/packages/core/src/components/cv-date-picker/cv-date-picker.vue
+++ b/packages/core/src/components/cv-date-picker/cv-date-picker.vue
@@ -77,11 +77,9 @@ import carbonFlatpickrFixEventsPlugin from './plugins/fixEventsPlugin';
 import carbonFlatpickrRangePlugin from './plugins/rangePlugin';
 import carbonFlatpickrMonthSelectPlugin from './plugins/monthSelectPlugin';
 
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin } from '../../mixins';
 import Calendar16 from '@carbon/icons-vue/es/calendar/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 // Weekdays shorthand for english locale
 l10n.en.weekdays.shorthand.forEach((day, index) => {
diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue b/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue
index f19e97c58..e70b7a99c 100644
--- a/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue
+++ b/packages/core/src/components/cv-dropdown/cv-dropdown-item.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvDropdownItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue b/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue
index 53f2c8ef9..bdd06b270 100644
--- a/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue
+++ b/packages/core/src/components/cv-dropdown/cv-dropdown-skeleton.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvDropdownSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-dropdown/cv-dropdown.vue b/packages/core/src/components/cv-dropdown/cv-dropdown.vue
index 1dc5360bb..f8c396dd7 100644
--- a/packages/core/src/components/cv-dropdown/cv-dropdown.vue
+++ b/packages/core/src/components/cv-dropdown/cv-dropdown.vue
@@ -114,13 +114,10 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
-import uidMixin from '../../mixins/uid-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { themeMixin, uidMixin, methodsMixin, carbonPrefixMixin } from '../../mixins';
 import CvDropdownItem from './cv-dropdown-item';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 import clickout from '../../directives/clickout';
 
 export default {
diff --git a/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue b/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue
index 5d8bebabc..ff3e48397 100644
--- a/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue
+++ b/packages/core/src/components/cv-feedback-button/_cv-feedback-button.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 const feedbackPhases = {
   DEFAULT: 0,
   FADE_IN: 1,
diff --git a/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue b/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue
index f7ee1f519..22d0e2c6e 100644
--- a/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue
+++ b/packages/core/src/components/cv-file-uploader/cv-file-uploader-skeleton.vue
@@ -9,7 +9,7 @@
 <script>
 import CvSkeletonText from '../cv-skeleton-text/cv-skeleton-text';
 import CvButtonSkeleton from '../cv-button/cv-button-skeleton';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvFileUploaderSkeleton',
diff --git a/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue b/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue
index 6a6149477..c5ac9d11f 100644
--- a/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue
+++ b/packages/core/src/components/cv-file-uploader/cv-file-uploader.vue
@@ -110,15 +110,13 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CvFormItem from '../cv-form/cv-form-item';
 import CheckmarkFilled16 from '@carbon/icons-vue/es/checkmark--filled/16';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 import { STATES, KINDS } from './consts.js';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvFileUploader',
diff --git a/packages/core/src/components/cv-form/cv-form-group.vue b/packages/core/src/components/cv-form/cv-form-group.vue
index 05b4b9508..807321dcc 100644
--- a/packages/core/src/components/cv-form/cv-form-group.vue
+++ b/packages/core/src/components/cv-form/cv-form-group.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvFormGroup',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-form/cv-form-item.vue b/packages/core/src/components/cv-form/cv-form-item.vue
index 49541b2a4..5abbedd41 100644
--- a/packages/core/src/components/cv-form/cv-form-item.vue
+++ b/packages/core/src/components/cv-form/cv-form-item.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvFormItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-form/cv-form.vue b/packages/core/src/components/cv-form/cv-form.vue
index 2ed859d32..21aadb2e5 100644
--- a/packages/core/src/components/cv-form/cv-form.vue
+++ b/packages/core/src/components/cv-form/cv-form.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvForm',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue b/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue
index 877d83612..68327d5ca 100644
--- a/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue
+++ b/packages/core/src/components/cv-inline-loading/cv-inline-loading.vue
@@ -29,7 +29,7 @@
 import { STATES } from './consts';
 import ErrorFilled16 from '@carbon/icons-vue/lib/error--filled/16';
 import CheckmarkFilled16 from '@carbon/icons-vue/lib/checkmark--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvInlineLoading',
diff --git a/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue b/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue
index a92feb23a..441df0eab 100644
--- a/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue
+++ b/packages/core/src/components/cv-inline-notification/cv-inline-notification.vue
@@ -46,13 +46,12 @@
 </template>
 
 <script>
-import notificationMixin from '../../mixins/notification-mixin';
+import { notificationMixin, carbonPrefixMixin } from '../../mixins';
 import ErrorFilled20 from '@carbon/icons-vue/es/error--filled/20';
 import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/20';
 import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/20';
 import Close20 from '@carbon/icons-vue/es/close/20';
 import InformationFilled20 from '@carbon/icons-vue/es/information--filled/20';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvInlineNotification',
diff --git a/packages/core/src/components/cv-link/cv-link.vue b/packages/core/src/components/cv-link/cv-link.vue
index 9658070cb..f4e51c867 100644
--- a/packages/core/src/components/cv-link/cv-link.vue
+++ b/packages/core/src/components/cv-link/cv-link.vue
@@ -11,8 +11,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvLink',
diff --git a/packages/core/src/components/cv-list/cv-list-item.vue b/packages/core/src/components/cv-list/cv-list-item.vue
index 250e10907..6844dc949 100644
--- a/packages/core/src/components/cv-list/cv-list-item.vue
+++ b/packages/core/src/components/cv-list/cv-list-item.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvListItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-list/cv-list.vue b/packages/core/src/components/cv-list/cv-list.vue
index 16adc254e..ea98662c1 100644
--- a/packages/core/src/components/cv-list/cv-list.vue
+++ b/packages/core/src/components/cv-list/cv-list.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvList',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-loading/cv-loading.vue b/packages/core/src/components/cv-loading/cv-loading.vue
index 481d381b4..852b35ca2 100644
--- a/packages/core/src/components/cv-loading/cv-loading.vue
+++ b/packages/core/src/components/cv-loading/cv-loading.vue
@@ -21,7 +21,7 @@
 
 <script>
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvLoading',
diff --git a/packages/core/src/components/cv-modal/cv-modal.vue b/packages/core/src/components/cv-modal/cv-modal.vue
index f52dbb642..91196e0f8 100644
--- a/packages/core/src/components/cv-modal/cv-modal.vue
+++ b/packages/core/src/components/cv-modal/cv-modal.vue
@@ -81,9 +81,8 @@
 
 <script>
 import CvButton from '../cv-button/cv-button';
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import Close16 from '@carbon/icons-vue/es/close/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvModal',
diff --git a/packages/core/src/components/cv-multi-select/cv-multi-select.vue b/packages/core/src/components/cv-multi-select/cv-multi-select.vue
index 773d7ceb3..c4b0dcc70 100644
--- a/packages/core/src/components/cv-multi-select/cv-multi-select.vue
+++ b/packages/core/src/components/cv-multi-select/cv-multi-select.vue
@@ -151,15 +151,12 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
+import { themeMixin, uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
 import Close16 from '@carbon/icons-vue/es/close/16';
-import uidMixin from '../../mixins/uid-mixin';
 import CvCheckbox from '../cv-checkbox/cv-checkbox';
 import CvTag from '../cv-tag/cv-tag';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 const TOP_AFTER_REOPEN = 0;
 const TOP = 1;
diff --git a/packages/core/src/components/cv-number-input/cv-number-input-skeleton.vue b/packages/core/src/components/cv-number-input/cv-number-input-skeleton.vue
index df1f928c5..397672442 100644
--- a/packages/core/src/components/cv-number-input/cv-number-input-skeleton.vue
+++ b/packages/core/src/components/cv-number-input/cv-number-input-skeleton.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvNumberInputSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-number-input/cv-number-input.vue b/packages/core/src/components/cv-number-input/cv-number-input.vue
index 9c0b7e26e..719bae4f4 100644
--- a/packages/core/src/components/cv-number-input/cv-number-input.vue
+++ b/packages/core/src/components/cv-number-input/cv-number-input.vue
@@ -83,14 +83,11 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CaretDownGlyph from '@carbon/icons-vue/es/caret--down/index';
 import CaretUpGlyph from '@carbon/icons-vue/es/caret--up/index';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvNumberInput',
diff --git a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu-item.vue b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu-item.vue
index 1f01a7446..7a28759ba 100644
--- a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu-item.vue
+++ b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu-item.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvOverflowMenuItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
index 04733a496..5bd1705db 100644
--- a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
+++ b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue
@@ -67,9 +67,7 @@
 
 <script>
 import OverflowMenuVertical16 from '@carbon/icons-vue/es/overflow-menu--vertical/16';
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvOverflowMenu',
diff --git a/packages/core/src/components/cv-pagination/cv-pagination.vue b/packages/core/src/components/cv-pagination/cv-pagination.vue
index c67864f46..d0b0585d9 100644
--- a/packages/core/src/components/cv-pagination/cv-pagination.vue
+++ b/packages/core/src/components/cv-pagination/cv-pagination.vue
@@ -83,7 +83,7 @@ import CvSelect from '../cv-select/cv-select';
 import CvSelectOption from '../cv-select/cv-select-option';
 import CaretLeft16 from '@carbon/icons-vue/es/caret--left/16';
 import CaretRight16 from '@carbon/icons-vue/es/caret--right/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 const newPageValue = (page, lastPage) => {
   let result = 1;
diff --git a/packages/core/src/components/cv-progress/cv-progress-step.vue b/packages/core/src/components/cv-progress/cv-progress-step.vue
index 68ec036f8..f20893866 100644
--- a/packages/core/src/components/cv-progress/cv-progress-step.vue
+++ b/packages/core/src/components/cv-progress/cv-progress-step.vue
@@ -43,7 +43,7 @@
 <script>
 import CheckmarkOutline16 from '@carbon/icons-vue/es/checkmark--outline/16';
 import Warning16 from '@carbon/icons-vue/es/warning/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 const states = ['incomplete', 'current', 'complete'];
 
diff --git a/packages/core/src/components/cv-progress/cv-progress.vue b/packages/core/src/components/cv-progress/cv-progress.vue
index 90cfe5980..9a6e6d460 100644
--- a/packages/core/src/components/cv-progress/cv-progress.vue
+++ b/packages/core/src/components/cv-progress/cv-progress.vue
@@ -18,7 +18,7 @@
 
 <script>
 import CvProgressStep from './cv-progress-step';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvProgress',
diff --git a/packages/core/src/components/cv-radio-button/cv-radio-button.vue b/packages/core/src/components/cv-radio-button/cv-radio-button.vue
index 2ac2c1d65..1409627e0 100644
--- a/packages/core/src/components/cv-radio-button/cv-radio-button.vue
+++ b/packages/core/src/components/cv-radio-button/cv-radio-button.vue
@@ -24,10 +24,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import radioMixin from '../../mixins/radio-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, radioMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvRadioButton',
diff --git a/packages/core/src/components/cv-radio-button/cv-radio-group.vue b/packages/core/src/components/cv-radio-button/cv-radio-group.vue
index 6ffb51366..40802c381 100644
--- a/packages/core/src/components/cv-radio-button/cv-radio-group.vue
+++ b/packages/core/src/components/cv-radio-button/cv-radio-group.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvRadioGroup',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-search/cv-search.vue b/packages/core/src/components/cv-search/cv-search.vue
index 71e489f05..1d1ddaad6 100644
--- a/packages/core/src/components/cv-search/cv-search.vue
+++ b/packages/core/src/components/cv-search/cv-search.vue
@@ -55,14 +55,11 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import Search16 from '@carbon/icons-vue/es/search/16';
 import Search20 from '@carbon/icons-vue/es/search/20';
 import Close16 from '@carbon/icons-vue/es/close/16';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvSearch',
diff --git a/packages/core/src/components/cv-select/cv-select-optgroup.vue b/packages/core/src/components/cv-select/cv-select-optgroup.vue
index f8c8b75a8..9a9d9fd5a 100644
--- a/packages/core/src/components/cv-select/cv-select-optgroup.vue
+++ b/packages/core/src/components/cv-select/cv-select-optgroup.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSelectOptgroup',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-select/cv-select-option.vue b/packages/core/src/components/cv-select/cv-select-option.vue
index 095390fa4..98f301f3f 100644
--- a/packages/core/src/components/cv-select/cv-select-option.vue
+++ b/packages/core/src/components/cv-select/cv-select-option.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSelectOption',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-select/cv-select.vue b/packages/core/src/components/cv-select/cv-select.vue
index 2f3a02ad2..58c1f38c5 100644
--- a/packages/core/src/components/cv-select/cv-select.vue
+++ b/packages/core/src/components/cv-select/cv-select.vue
@@ -56,13 +56,10 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CvWrapper from '../cv-wrapper/_cv-wrapper';
 import ChevronDownGlyph from '@carbon/icons-vue/es/chevron--down';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvSelect',
diff --git a/packages/core/src/components/cv-skeleton-text/cv-skeleton-text.vue b/packages/core/src/components/cv-skeleton-text/cv-skeleton-text.vue
index ebbc35cac..b91d61e90 100644
--- a/packages/core/src/components/cv-skeleton-text/cv-skeleton-text.vue
+++ b/packages/core/src/components/cv-skeleton-text/cv-skeleton-text.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSkeletonText',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-slider/cv-slider-skeleton.vue b/packages/core/src/components/cv-slider/cv-slider-skeleton.vue
index c42b094e9..854bd32c8 100644
--- a/packages/core/src/components/cv-slider/cv-slider-skeleton.vue
+++ b/packages/core/src/components/cv-slider/cv-slider-skeleton.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSliderSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-slider/cv-slider.vue b/packages/core/src/components/cv-slider/cv-slider.vue
index 42cceed8c..faf6684e0 100644
--- a/packages/core/src/components/cv-slider/cv-slider.vue
+++ b/packages/core/src/components/cv-slider/cv-slider.vue
@@ -56,10 +56,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvSlider',
diff --git a/packages/core/src/components/cv-structured-list/_cv-structured-list-item-selectable.vue b/packages/core/src/components/cv-structured-list/_cv-structured-list-item-selectable.vue
index 06646de78..e4c557327 100644
--- a/packages/core/src/components/cv-structured-list/_cv-structured-list-item-selectable.vue
+++ b/packages/core/src/components/cv-structured-list/_cv-structured-list-item-selectable.vue
@@ -26,11 +26,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import radioMixin from '../../mixins/radio-mixin';
+import { uidMixin, radioMixin, carbonPrefixMixin } from '../../mixins';
 import CheckmarkFilled16 from '@carbon/icons-vue/es/checkmark--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-
 export default {
   name: 'CvStructuredListItemSelectable',
   components: { CheckmarkFilled16 },
diff --git a/packages/core/src/components/cv-structured-list/_cv-structured-list-item-standard.vue b/packages/core/src/components/cv-structured-list/_cv-structured-list-item-standard.vue
index b197ba9ba..6811b4740 100644
--- a/packages/core/src/components/cv-structured-list/_cv-structured-list-item-standard.vue
+++ b/packages/core/src/components/cv-structured-list/_cv-structured-list-item-standard.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvStructuredListItemStandard',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-structured-list/cv-structured-list-data.vue b/packages/core/src/components/cv-structured-list/cv-structured-list-data.vue
index c022d7fac..09af5ef91 100644
--- a/packages/core/src/components/cv-structured-list/cv-structured-list-data.vue
+++ b/packages/core/src/components/cv-structured-list/cv-structured-list-data.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvStructuredListData',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-structured-list/cv-structured-list-heading.vue b/packages/core/src/components/cv-structured-list/cv-structured-list-heading.vue
index 2deb2247a..7b4239e3f 100644
--- a/packages/core/src/components/cv-structured-list/cv-structured-list-heading.vue
+++ b/packages/core/src/components/cv-structured-list/cv-structured-list-heading.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvStructuredListHeading',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-structured-list/cv-structured-list.vue b/packages/core/src/components/cv-structured-list/cv-structured-list.vue
index e856ce5b6..caabb9575 100644
--- a/packages/core/src/components/cv-structured-list/cv-structured-list.vue
+++ b/packages/core/src/components/cv-structured-list/cv-structured-list.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvStructuredList',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-tabs/cv-tab.vue b/packages/core/src/components/cv-tabs/cv-tab.vue
index 720145567..2b288413d 100644
--- a/packages/core/src/components/cv-tabs/cv-tab.vue
+++ b/packages/core/src/components/cv-tabs/cv-tab.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin } from '../../mixins';
 
 export default {
   name: 'CvTab',
diff --git a/packages/core/src/components/cv-tabs/cv-tabs-skeleton.vue b/packages/core/src/components/cv-tabs/cv-tabs-skeleton.vue
index a3228ff74..17e342c69 100644
--- a/packages/core/src/components/cv-tabs/cv-tabs-skeleton.vue
+++ b/packages/core/src/components/cv-tabs/cv-tabs-skeleton.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvTabsSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-tabs/cv-tabs.vue b/packages/core/src/components/cv-tabs/cv-tabs.vue
index 0f3eac307..7119d78ab 100644
--- a/packages/core/src/components/cv-tabs/cv-tabs.vue
+++ b/packages/core/src/components/cv-tabs/cv-tabs.vue
@@ -61,7 +61,7 @@
 
 <script>
 import ChevronDownGlyph from '@carbon/icons-vue/es/chevron--down';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvTabs',
diff --git a/packages/core/src/components/cv-tag/cv-tag-skeleton.vue b/packages/core/src/components/cv-tag/cv-tag-skeleton.vue
index 2d5f40d50..90ea018f1 100644
--- a/packages/core/src/components/cv-tag/cv-tag-skeleton.vue
+++ b/packages/core/src/components/cv-tag/cv-tag-skeleton.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvTagSkeleton',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-tag/cv-tag.vue b/packages/core/src/components/cv-tag/cv-tag.vue
index f236e0268..976faa563 100644
--- a/packages/core/src/components/cv-tag/cv-tag.vue
+++ b/packages/core/src/components/cv-tag/cv-tag.vue
@@ -30,7 +30,7 @@
 
 <script>
 import Close16 from '@carbon/icons-vue/es/close/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 const tagKinds = [
   'red',
diff --git a/packages/core/src/components/cv-text-area/cv-text-area.vue b/packages/core/src/components/cv-text-area/cv-text-area.vue
index 70acb5661..e006ab1c0 100644
--- a/packages/core/src/components/cv-text-area/cv-text-area.vue
+++ b/packages/core/src/components/cv-text-area/cv-text-area.vue
@@ -43,11 +43,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, themeMixin, methodsMixin, carbonPrefixMixin } from '../../mixins';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvTextArea',
diff --git a/packages/core/src/components/cv-text-input/cv-text-input.vue b/packages/core/src/components/cv-text-input/cv-text-input.vue
index a2db95b19..37dd44eeb 100644
--- a/packages/core/src/components/cv-text-input/cv-text-input.vue
+++ b/packages/core/src/components/cv-text-input/cv-text-input.vue
@@ -61,13 +61,10 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, themeMixin, methodsMixin, carbonPrefixMixin } from '../../mixins';
 import WarningFilled16 from '@carbon/icons-vue/es/warning--filled/16';
 import View16 from '@carbon/icons-vue/es/view/16';
 import ViewOff16 from '@carbon/icons-vue/es/view--off/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvTextInput',
diff --git a/packages/core/src/components/cv-tile/_cv-tile-clickable.vue b/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
index 3d0b259a5..029c6448c 100644
--- a/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
+++ b/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
@@ -13,9 +13,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { LinkMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvTileClickable',
diff --git a/packages/core/src/components/cv-tile/_cv-tile-expandable.vue b/packages/core/src/components/cv-tile/_cv-tile-expandable.vue
index c78121e12..741d462a0 100644
--- a/packages/core/src/components/cv-tile/_cv-tile-expandable.vue
+++ b/packages/core/src/components/cv-tile/_cv-tile-expandable.vue
@@ -37,8 +37,7 @@
 
 <script>
 import ChevronDown16 from '@carbon/icons-vue/es/chevron--down/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvTileExpandable',
diff --git a/packages/core/src/components/cv-tile/_cv-tile-selectable.vue b/packages/core/src/components/cv-tile/_cv-tile-selectable.vue
index cedb328f5..545ede178 100644
--- a/packages/core/src/components/cv-tile/_cv-tile-selectable.vue
+++ b/packages/core/src/components/cv-tile/_cv-tile-selectable.vue
@@ -34,11 +34,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import checkMixin from '../../mixins/check-mixin';
+import { uidMixin, checkMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CheckmarkFilled16 from '@carbon/icons-vue/es/checkmark--filled/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvTileSelectable',
diff --git a/packages/core/src/components/cv-tile/cv-tile.vue b/packages/core/src/components/cv-tile/cv-tile.vue
index 060e31d78..bdbbfeb86 100644
--- a/packages/core/src/components/cv-tile/cv-tile.vue
+++ b/packages/core/src/components/cv-tile/cv-tile.vue
@@ -19,13 +19,11 @@
 </template>
 
 <script>
-import themeMixin from '../../mixins/theme-mixin';
+import { themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CvTileClickable from './_cv-tile-clickable';
 import CvTileExpandable from './_cv-tile-expandable';
 import CvTileSelectable from './_cv-tile-selectable';
 import CvTileStandard from './_cv-tile-standard';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvTile',
diff --git a/packages/core/src/components/cv-time-picker/cv-time-picker.vue b/packages/core/src/components/cv-time-picker/cv-time-picker.vue
index ea6e5dd1b..c664d37a1 100644
--- a/packages/core/src/components/cv-time-picker/cv-time-picker.vue
+++ b/packages/core/src/components/cv-time-picker/cv-time-picker.vue
@@ -64,12 +64,9 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import themeMixin from '../../mixins/theme-mixin';
+import { uidMixin, themeMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 import CvSelect from '../cv-select/cv-select';
 import CvSelectOption from '../cv-select/cv-select-option';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
 
 export default {
   name: 'CvTimePicker',
diff --git a/packages/core/src/components/cv-toast-notification/cv-toast-notification.vue b/packages/core/src/components/cv-toast-notification/cv-toast-notification.vue
index 121143950..fac97b79e 100644
--- a/packages/core/src/components/cv-toast-notification/cv-toast-notification.vue
+++ b/packages/core/src/components/cv-toast-notification/cv-toast-notification.vue
@@ -29,13 +29,12 @@
 </template>
 
 <script>
-import notificationMixin from '../../mixins/notification-mixin';
+import { notificationMixin, carbonPrefixMixin } from '../../mixins';
 import ErrorFilled20 from '@carbon/icons-vue/es/error--filled/20';
 import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/20';
 import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/20';
 import Close20 from '@carbon/icons-vue/es/close/20';
 import InformationFilled20 from '@carbon/icons-vue/es/information--filled/20';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvToastNotification',
diff --git a/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue b/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
index 92c130af8..c5903541a 100644
--- a/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
+++ b/packages/core/src/components/cv-toggle/cv-toggle-skeleton.vue
@@ -14,8 +14,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvToggleSkeleton',
   mixins: [uidMixin, carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-toggle/cv-toggle.vue b/packages/core/src/components/cv-toggle/cv-toggle.vue
index eab0278b4..62b1d85ab 100644
--- a/packages/core/src/components/cv-toggle/cv-toggle.vue
+++ b/packages/core/src/components/cv-toggle/cv-toggle.vue
@@ -29,10 +29,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import checkMixin from '../../mixins/check-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
-import methodsMixin from '../../mixins/methods-mixin';
+import { uidMixin, checkMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvToggle',
diff --git a/packages/core/src/components/cv-toolbar/cv-toolbar-divider.vue b/packages/core/src/components/cv-toolbar/cv-toolbar-divider.vue
index 1b3f537db..4a10a7d49 100644
--- a/packages/core/src/components/cv-toolbar/cv-toolbar-divider.vue
+++ b/packages/core/src/components/cv-toolbar/cv-toolbar-divider.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvToolbarDivider',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-toolbar/cv-toolbar-option.vue b/packages/core/src/components/cv-toolbar/cv-toolbar-option.vue
index 531970cb0..190eddb4e 100644
--- a/packages/core/src/components/cv-toolbar/cv-toolbar-option.vue
+++ b/packages/core/src/components/cv-toolbar/cv-toolbar-option.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvToolbarOption',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-toolbar/cv-toolbar-search.vue b/packages/core/src/components/cv-toolbar/cv-toolbar-search.vue
index 112c506f9..1f894496f 100644
--- a/packages/core/src/components/cv-toolbar/cv-toolbar-search.vue
+++ b/packages/core/src/components/cv-toolbar/cv-toolbar-search.vue
@@ -14,7 +14,7 @@
 
 <script>
 import CvSearch from '../cv-search/cv-search';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvToolbarSearch',
diff --git a/packages/core/src/components/cv-toolbar/cv-toolbar-title.vue b/packages/core/src/components/cv-toolbar/cv-toolbar-title.vue
index bcda947c2..c32807f01 100644
--- a/packages/core/src/components/cv-toolbar/cv-toolbar-title.vue
+++ b/packages/core/src/components/cv-toolbar/cv-toolbar-title.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvToolbarTitle',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-toolbar/cv-toolbar.vue b/packages/core/src/components/cv-toolbar/cv-toolbar.vue
index fd7a54223..5bb641610 100644
--- a/packages/core/src/components/cv-toolbar/cv-toolbar.vue
+++ b/packages/core/src/components/cv-toolbar/cv-toolbar.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvToolbar',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
index 3935c5840..b11c979d5 100644
--- a/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
+++ b/packages/core/src/components/cv-tooltip/cv-definition-tooltip.vue
@@ -18,8 +18,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvDefinitionTooltip',
diff --git a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
index 0e7699663..5dfc18dc1 100644
--- a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
+++ b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue
@@ -58,9 +58,8 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import Information16 from '@carbon/icons-vue/es/information/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvInteractiveTooltip',
diff --git a/packages/core/src/components/cv-tooltip/cv-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-tooltip.vue
index e5d1106ea..9c2d63eb8 100644
--- a/packages/core/src/components/cv-tooltip/cv-tooltip.vue
+++ b/packages/core/src/components/cv-tooltip/cv-tooltip.vue
@@ -18,7 +18,7 @@
 
 <script>
 import Information16 from '@carbon/icons-vue/es/information/16';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvTooltip',
diff --git a/packages/core/src/components/cv-ui-shell/_cv-side-nav-footer.vue b/packages/core/src/components/cv-ui-shell/_cv-side-nav-footer.vue
index 9f3b53f37..91fa9e61a 100644
--- a/packages/core/src/components/cv-ui-shell/_cv-side-nav-footer.vue
+++ b/packages/core/src/components/cv-ui-shell/_cv-side-nav-footer.vue
@@ -25,7 +25,7 @@
 <script>
 import Close20 from '@carbon/icons-vue/es/close/20';
 import ChevronRight20 from '@carbon/icons-vue/es/chevron--right/20';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSideNavFooter',
diff --git a/packages/core/src/components/cv-ui-shell/_cv-side-nav-link-text.vue b/packages/core/src/components/cv-ui-shell/_cv-side-nav-link-text.vue
index 63ef02f93..a1abc8250 100644
--- a/packages/core/src/components/cv-ui-shell/_cv-side-nav-link-text.vue
+++ b/packages/core/src/components/cv-ui-shell/_cv-side-nav-link-text.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSideNavLinkText',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-content.vue b/packages/core/src/components/cv-ui-shell/cv-content.vue
index caaee5fbd..6553acb96 100644
--- a/packages/core/src/components/cv-ui-shell/cv-content.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-content.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvContent',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue b/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
index f8e6b9824..baaba959c 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-global-action.vue
@@ -19,8 +19,7 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderGlobalAction',
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue b/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
index a5bfe0890..f39faa1f1 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-menu-button.vue
@@ -25,10 +25,9 @@
 </template>
 
 <script>
-import uidMixin from '../../mixins/uid-mixin';
+import { uidMixin, carbonPrefixMixin } from '../../mixins';
 import Close20 from '@carbon/icons-vue/es/close/20';
 import Menu20 from '@carbon/icons-vue/es/menu/20';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvHeaderMenuButton',
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue b/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
index 3b3923579..89e9de91d 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
@@ -16,8 +16,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderMenuItem',
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-menu.vue b/packages/core/src/components/cv-ui-shell/cv-header-menu.vue
index dd0e7fbff..2f2939b69 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-menu.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-menu.vue
@@ -36,7 +36,7 @@
 
 <script>
 import ChevronDownGlyph from '@carbon/icons-vue/es/chevron--down';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderMenu',
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-name.vue b/packages/core/src/components/cv-ui-shell/cv-header-name.vue
index c4a8811f5..ac39dd04e 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-name.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-name.vue
@@ -6,8 +6,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderName',
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-nav.vue b/packages/core/src/components/cv-ui-shell/cv-header-nav.vue
index 113bbafb1..25e89580e 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-nav.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-nav.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvHeaderNav',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-panel.vue b/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
index 9d7a97248..9c01e59c0 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvHeaderPanel',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-side-nav-items.vue b/packages/core/src/components/cv-ui-shell/cv-header-side-nav-items.vue
index a93785bed..7e6869cce 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-side-nav-items.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-side-nav-items.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvHeaderSideNavItems',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-header.vue b/packages/core/src/components/cv-ui-shell/cv-header.vue
index afec73b95..d26c812b5 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvHeader',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-icon.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-icon.vue
index 50ffcd83e..c86743e7b 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-icon.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-icon.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSideNavIcon',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-items.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-items.vue
index ad891c5f6..6ed8722d3 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-items.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-items.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSideNavItems',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
index a2c9e0df5..c4057993a 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
@@ -21,10 +21,9 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 import CvSideNavIcon from './cv-side-nav-icon';
 import CvSideNavLinkText from './_cv-side-nav-link-text';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvSideNavLink',
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
index c8619098a..3e216cb24 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
@@ -15,9 +15,8 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 import CvSideNavLinkText from './_cv-side-nav-link-text';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
 
 export default {
   name: 'CvSideNavMenuItem',
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu.vue
index 0af26f6f8..e56f2cc48 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu.vue
@@ -38,7 +38,7 @@
 <script>
 import ChevronDown20 from '@carbon/icons-vue/es/chevron--down/20';
 import CvSideNavIcon from './cv-side-nav-icon';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSideNavMenu',
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
index 0d7c36a4a..f23655863 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
@@ -28,7 +28,7 @@
 
 <script>
 import CvSideNavFooter from './_cv-side-nav-footer';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSideNav',
diff --git a/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue b/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
index 3b2168743..5049eff7c 100644
--- a/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
@@ -10,8 +10,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSkipToContent',
diff --git a/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue b/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
index 7275eb504..4a15ee7ab 100644
--- a/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
@@ -14,8 +14,7 @@
 </template>
 
 <script>
-import LinkMixin from '../../mixins/link-mixin';
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { LinkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSwitcherItemLink',
diff --git a/packages/core/src/components/cv-ui-shell/cv-switcher-item.vue b/packages/core/src/components/cv-ui-shell/cv-switcher-item.vue
index fc0fed338..e1d433abd 100644
--- a/packages/core/src/components/cv-ui-shell/cv-switcher-item.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-switcher-item.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSwitcherItem',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/components/cv-ui-shell/cv-switcher.vue b/packages/core/src/components/cv-ui-shell/cv-switcher.vue
index dc1f843d9..d76e6cb48 100644
--- a/packages/core/src/components/cv-ui-shell/cv-switcher.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-switcher.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import carbonPrefixMixin from '../../mixins/carbon-prefix-mixin';
+import { carbonPrefixMixin } from '../../mixins';
 export default {
   name: 'CvSwitcher',
   mixins: [carbonPrefixMixin],
diff --git a/packages/core/src/mixins/index.js b/packages/core/src/mixins/index.js
new file mode 100644
index 000000000..d0241e386
--- /dev/null
+++ b/packages/core/src/mixins/index.js
@@ -0,0 +1,12 @@
+// import mixins
+import carbonPrefixMixin from './carbon-prefix-mixin';
+import checkMixin from './check-mixin';
+import linkMixin from './link-mixin';
+import methodsMixin from './methods-mixin';
+import notificationMixin from './notification-mixin';
+import radioMixin from './radio-mixin';
+import themeMixin from './theme-mixin';
+import uidMixin from './uid-mixin';
+
+// export all the mixins
+export { carbonPrefixMixin, checkMixin, linkMixin, methodsMixin, notificationMixin, radioMixin, themeMixin, uidMixin };

From 51927352a100017915ec7b2c15f54f897ee0d410 Mon Sep 17 00:00:00 2001
From: Jack Mason <jack.mason1@ibm.com>
Date: Fri, 2 Oct 2020 16:00:22 +0100
Subject: [PATCH 2/2] fix: fix linkMixin capitalization

---
 packages/core/src/components/cv-link/cv-link.vue              | 4 ++--
 packages/core/src/components/cv-tile/_cv-tile-clickable.vue   | 4 ++--
 .../core/src/components/cv-ui-shell/cv-header-menu-item.vue   | 4 ++--
 packages/core/src/components/cv-ui-shell/cv-header-name.vue   | 4 ++--
 packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue | 4 ++--
 .../core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue | 4 ++--
 .../core/src/components/cv-ui-shell/cv-skip-to-content.vue    | 4 ++--
 .../core/src/components/cv-ui-shell/cv-switcher-item-link.vue | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/components/cv-link/cv-link.vue b/packages/core/src/components/cv-link/cv-link.vue
index f4e51c867..5cdecfeff 100644
--- a/packages/core/src/components/cv-link/cv-link.vue
+++ b/packages/core/src/components/cv-link/cv-link.vue
@@ -11,11 +11,11 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvLink',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   props: {
     inline: Boolean,
   },
diff --git a/packages/core/src/components/cv-tile/_cv-tile-clickable.vue b/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
index 029c6448c..d8e4d0226 100644
--- a/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
+++ b/packages/core/src/components/cv-tile/_cv-tile-clickable.vue
@@ -13,10 +13,10 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin, methodsMixin } from '../../mixins';
 
 export default {
   name: 'CvTileClickable',
-  mixins: [LinkMixin, carbonPrefixMixin, methodsMixin({ target: ['blur', 'focus'] })],
+  mixins: [linkMixin, carbonPrefixMixin, methodsMixin({ target: ['blur', 'focus'] })],
 };
 </script>
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue b/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
index 89e9de91d..33902f95c 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-menu-item.vue
@@ -16,11 +16,11 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderMenuItem',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   inheritAttrs: false,
   props: {
     active: Boolean,
diff --git a/packages/core/src/components/cv-ui-shell/cv-header-name.vue b/packages/core/src/components/cv-ui-shell/cv-header-name.vue
index ac39dd04e..67fb20a55 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-name.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-name.vue
@@ -6,11 +6,11 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvHeaderName',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   props: {
     prefix: String,
   },
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
index c4057993a..a42451e0d 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-link.vue
@@ -21,14 +21,14 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 import CvSideNavIcon from './cv-side-nav-icon';
 import CvSideNavLinkText from './_cv-side-nav-link-text';
 
 export default {
   name: 'CvSideNavLink',
   inheritAttrs: false,
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   components: { CvSideNavIcon, CvSideNavLinkText },
   props: {
     active: Boolean,
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
index 3e216cb24..e2f6d3088 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav-menu-item.vue
@@ -15,13 +15,13 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 import CvSideNavLinkText from './_cv-side-nav-link-text';
 
 export default {
   name: 'CvSideNavMenuItem',
   inheritAttrs: false,
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   components: { CvSideNavLinkText },
   props: {
     active: Boolean,
diff --git a/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue b/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
index 5049eff7c..ecfdf8910 100644
--- a/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-skip-to-content.vue
@@ -10,10 +10,10 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSkipToContent',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
 };
 </script>
diff --git a/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue b/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
index 4a15ee7ab..389d44a5f 100644
--- a/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-switcher-item-link.vue
@@ -14,11 +14,11 @@
 </template>
 
 <script>
-import { LinkMixin, carbonPrefixMixin } from '../../mixins';
+import { linkMixin, carbonPrefixMixin } from '../../mixins';
 
 export default {
   name: 'CvSwitcherItemLink',
-  mixins: [LinkMixin, carbonPrefixMixin],
+  mixins: [linkMixin, carbonPrefixMixin],
   props: {
     selected: Boolean,
   },