diff --git a/packages/react/src/components/NumberInput/NumberInput-story.js b/packages/react/src/components/NumberInput/NumberInput-story.js
index bbff0065c5c1..58515d525c56 100644
--- a/packages/react/src/components/NumberInput/NumberInput-story.js
+++ b/packages/react/src/components/NumberInput/NumberInput-story.js
@@ -17,6 +17,7 @@ import {
   select,
 } from '@storybook/addon-knobs';
 import NumberInput from '../NumberInput';
+import { NumberInput as OGNumberInput } from './NumberInput';
 import NumberInputSkeleton from '../NumberInput/NumberInput.Skeleton';
 import mdx from './NumberInput.mdx';
 
@@ -65,10 +66,10 @@ const props = () => ({
 
 export default {
   title: 'NumberInput',
+  component: OGNumberInput,
   decorators: [withKnobs],
 
   parameters: {
-    component: NumberInput,
     docs: {
       page: mdx,
     },
diff --git a/packages/react/src/components/NumberInput/NumberInput.js b/packages/react/src/components/NumberInput/NumberInput.js
index 89240af1eddd..def7e6650e34 100644
--- a/packages/react/src/components/NumberInput/NumberInput.js
+++ b/packages/react/src/components/NumberInput/NumberInput.js
@@ -504,6 +504,7 @@ class NumberInput extends Component {
   }
 }
 
+export { NumberInput };
 export default (() => {
   const forwardRef = (props, ref) => <NumberInput {...props} innerRef={ref} />;
   forwardRef.displayName = 'NumberInput';
diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
index 13cca7c5cd2e..4306e01565b0 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
@@ -10,6 +10,7 @@ import { action } from '@storybook/addon-actions';
 import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
 import { withReadme } from 'storybook-readme';
 import OverflowMenu from '../OverflowMenu';
+import { OverflowMenu as OGOverflowMenu } from './OverflowMenu';
 import OverflowMenuItem from '../OverflowMenuItem';
 import OverflowREADME from './README.md';
 import mdx from './OverflowMenu.mdx';
@@ -57,16 +58,15 @@ OverflowMenu.displayName = 'OverflowMenu';
 export default {
   title: 'OverflowMenu',
   decorators: [withKnobs],
+  component: OGOverflowMenu,
+  subcomponents: {
+    OverflowMenuItem,
+  },
 
   parameters: {
-    component: OverflowMenu,
     docs: {
       page: mdx,
     },
-
-    subcomponents: {
-      OverflowMenuItem,
-    },
   },
 };
 
diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu.js b/packages/react/src/components/OverflowMenu/OverflowMenu.js
index 90f013ab7fd7..89e34f36ac07 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu.js
@@ -560,6 +560,7 @@ class OverflowMenu extends Component {
   }
 }
 
+export { OverflowMenu };
 export default (() => {
   const forwardRef = (props, ref) => <OverflowMenu {...props} innerRef={ref} />;
   forwardRef.displayName = 'OverflowMenu';
diff --git a/packages/react/src/components/RadioButton/RadioButton-story.js b/packages/react/src/components/RadioButton/RadioButton-story.js
index 4a90ee370c46..7087014e27e3 100644
--- a/packages/react/src/components/RadioButton/RadioButton-story.js
+++ b/packages/react/src/components/RadioButton/RadioButton-story.js
@@ -10,6 +10,7 @@ import { action } from '@storybook/addon-actions';
 
 import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
 import RadioButton from '../RadioButton';
+import { RadioButton as OGRadioButton } from './RadioButton';
 import RadioButtonSkeleton from '../RadioButton/RadioButton.Skeleton';
 import mdx from './RadioButton.mdx';
 
@@ -35,16 +36,15 @@ const radioProps = () => ({
 export default {
   title: 'RadioButton',
   decorators: [withKnobs],
+  component: OGRadioButton,
+  subcomponents: {
+    RadioButtonSkeleton,
+  },
 
   parameters: {
-    component: RadioButton,
     docs: {
       page: mdx,
     },
-
-    subcomponents: {
-      RadioButtonSkeleton,
-    },
   },
 };
 
diff --git a/packages/react/src/components/RadioButton/RadioButton.js b/packages/react/src/components/RadioButton/RadioButton.js
index 8614f54bbcb9..b0ec7b192ccb 100644
--- a/packages/react/src/components/RadioButton/RadioButton.js
+++ b/packages/react/src/components/RadioButton/RadioButton.js
@@ -140,6 +140,7 @@ class RadioButton extends React.Component {
   }
 }
 
+export { RadioButton };
 export default (() => {
   const forwardRef = (props, ref) => <RadioButton {...props} innerRef={ref} />;
   forwardRef.displayName = 'RadioButton';
diff --git a/packages/react/src/components/Tooltip/Tooltip-story.js b/packages/react/src/components/Tooltip/Tooltip-story.js
index 7b071a6f5c5c..6aaf0fcb67c5 100644
--- a/packages/react/src/components/Tooltip/Tooltip-story.js
+++ b/packages/react/src/components/Tooltip/Tooltip-story.js
@@ -15,6 +15,7 @@ import {
   boolean,
 } from '@storybook/addon-knobs';
 import Tooltip from '../Tooltip';
+import { Tooltip as OGTooltip } from './Tooltip';
 import Button from '../Button';
 import { OverflowMenuVertical16 } from '@carbon/icons-react';
 import mdx from './Tooltip.mdx';
@@ -127,10 +128,10 @@ function UncontrolledTooltipExample() {
 
 export default {
   title: 'Tooltip',
+  component: OGTooltip,
   decorators: [withKnobs],
 
   parameters: {
-    component: Tooltip,
     docs: {
       page: mdx,
     },
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
index 11090edef5d1..0d4d0771f71e 100644
--- a/packages/react/src/components/Tooltip/Tooltip.js
+++ b/packages/react/src/components/Tooltip/Tooltip.js
@@ -521,6 +521,7 @@ class Tooltip extends Component {
   }
 }
 
+export { Tooltip };
 export default (() => {
   const forwardRef = (props, ref) => <Tooltip {...props} innerRef={ref} />;
   forwardRef.displayName = 'Tooltip';