diff --git a/ActionGuide/ActionGuide.js b/ActionGuide/ActionGuide.js
index 8a2d6ff44e..bcf364cc24 100644
--- a/ActionGuide/ActionGuide.js
+++ b/ActionGuide/ActionGuide.js
@@ -115,7 +115,7 @@ const ActionGuideDecorator = compose(
  *
  * @class ActionGuide
  * @memberof sandstone/ActionGuide
- * @extends sandstone/ActionGuide.ActionGuideBase
+ * @extends sandstone/ActionGuide#ActionGuideBase
  * @mixes sandstone/ActionGuide.ActionGuideDecorator
  * @ui
  * @public
diff --git a/Alert/Alert.js b/Alert/Alert.js
index 2d0da23906..63f39bbe57 100644
--- a/Alert/Alert.js
+++ b/Alert/Alert.js
@@ -247,7 +247,7 @@ const AlertBase = kind({
  *
  * @class Alert
  * @memberof sandstone/Alert
- * @extends sandstone/Alert.AlertBase
+ * @extends sandstone/Alert#AlertBase
  * @mixes ui/Slottable.Slottable
  * @ui
  * @public
diff --git a/BodyText/BodyText.js b/BodyText/BodyText.js
index f69bc1ce99..25d1604573 100644
--- a/BodyText/BodyText.js
+++ b/BodyText/BodyText.js
@@ -32,7 +32,7 @@ const MarqueeBodyText = MarqueeDecorator(UiBodyText);
  *
  * @class BodyTextBase
  * @memberof sandstone/BodyText
- * @extends ui/BodyText.BodyText
+ * @extends ui/BodyText#BodyText
  * @ui
  * @public
  */
@@ -152,7 +152,7 @@ const BodyTextDecorator = compose(
  *
  * @class BodyText
  * @memberof sandstone/BodyText
- * @extends sandstone/BodyText.BodyTextBase
+ * @extends sandstone/BodyText#BodyTextBase
  * @mixes sandstone/BodyText.BodyTextDecorator
  * @ui
  * @public
diff --git a/Button/Button.js b/Button/Button.js
index 89f787bcfc..2c27ae9fb4 100644
--- a/Button/Button.js
+++ b/Button/Button.js
@@ -36,7 +36,7 @@ import componentCss from './Button.module.less';
  *
  * @class ButtonBase
  * @memberof sandstone/Button
- * @extends ui/Button.ButtonBase
+ * @extends ui/Button#ButtonBase
  * @ui
  * @public
  */
@@ -289,7 +289,7 @@ const ButtonDecorator = compose(
  *
  * @class Button
  * @memberof sandstone/Button
- * @extends sandstone/Button.ButtonBase
+ * @extends sandstone/Button#ButtonBase
  * @mixes sandstone/Button.ButtonDecorator
  * @ui
  * @public
diff --git a/Checkbox/Checkbox.js b/Checkbox/Checkbox.js
index 9683bf171d..a0e64531a8 100644
--- a/Checkbox/Checkbox.js
+++ b/Checkbox/Checkbox.js
@@ -34,7 +34,7 @@ import componentCss from './Checkbox.module.less';
  *
  * @class CheckboxBase
  * @memberof sandstone/Checkbox
- * @extends sandstone/Icon.Icon
+ * @extends sandstone/Icon#Icon
  * @ui
  * @public
  */
@@ -200,7 +200,7 @@ const CheckboxDecorator = compose(
  *
  * @class Checkbox
  * @memberof sandstone/Checkbox
- * @extends sandstone/Checkbox.CheckboxBase
+ * @extends sandstone/Checkbox#CheckboxBase
  * @mixes sandstone/Checkbox.CheckboxDecorator
  * @ui
  * @public
diff --git a/CheckboxItem/CheckboxItem.js b/CheckboxItem/CheckboxItem.js
index f2bce59667..79d4336b0d 100644
--- a/CheckboxItem/CheckboxItem.js
+++ b/CheckboxItem/CheckboxItem.js
@@ -49,7 +49,7 @@ Checkbox.displayName = 'Checkbox';
  *
  * @class CheckboxItemBase
  * @memberof sandstone/CheckboxItem
- * @extends sandstone/Item.Item
+ * @extends sandstone/Item#Item
  * @omit iconComponent
  * @ui
  * @public
@@ -185,7 +185,7 @@ const CheckboxItemDecorator = compose(
  *
  * @class CheckboxItem
  * @memberof sandstone/CheckboxItem
- * @extends sandstone/CheckboxItem.CheckboxItemBase
+ * @extends sandstone/CheckboxItem#CheckboxItemBase
  * @mixes sandstone/CheckboxItem.CheckboxItemDecorator
  * @ui
  * @public
diff --git a/DatePicker/DatePicker.js b/DatePicker/DatePicker.js
index cfb30ff688..7bac821454 100644
--- a/DatePicker/DatePicker.js
+++ b/DatePicker/DatePicker.js
@@ -117,7 +117,7 @@ const dateTimeConfig = {
  *
  * @class DatePicker
  * @memberof sandstone/DatePicker
- * @extends sandstone/DatePicker.DatePickerBase
+ * @extends sandstone/DatePicker#DatePickerBase
  * @mixes ui/Changeable.Changeable
  * @omit day
  * @omit maxDays
diff --git a/DayPicker/DayPicker.js b/DayPicker/DayPicker.js
index 1a136fe734..60a6d67c70 100644
--- a/DayPicker/DayPicker.js
+++ b/DayPicker/DayPicker.js
@@ -36,7 +36,7 @@ import css from './DayPicker.module.less';
  *
  * @class DayPickerBase
  * @memberof sandstone/DayPicker
- * @extends ui/Group.Group
+ * @extends ui/Group#Group
  * @omit children
  * @ui
  * @public
@@ -128,7 +128,7 @@ const DayPickerDecorator = compose(
  *
  * @class DayPicker
  * @memberof sandstone/DayPicker
- * @extends sandstone/DayPicker.DayPickerBase
+ * @extends sandstone/DayPicker#DayPickerBase
  * @mixes ui/Changeable.Changeable
  * @omit onChange
  * @omit value
diff --git a/Dropdown/Dropdown.js b/Dropdown/Dropdown.js
index 6756160fe5..11a3534156 100644
--- a/Dropdown/Dropdown.js
+++ b/Dropdown/Dropdown.js
@@ -85,8 +85,8 @@ DropdownButton.displayName = 'DropdownButton';
  *
  * @class DropdownBase
  * @memberof sandstone/Dropdown
- * @extends sandstone/Button.Button
- * @extends sandstone/ContextualPopupDecorator.ContextualPopupDecorator
+ * @extends sandstone/Button#Button
+ * @extends sandstone/ContextualPopupDecorator#ContextualPopupDecorator
  * @omit popupComponent
  * @ui
  * @public
@@ -441,7 +441,7 @@ const DropdownDecorator = compose(
  *
  * @class Dropdown
  * @memberof sandstone/Dropdown
- * @extends sandstone/Dropdown.DropdownBase
+ * @extends sandstone/Dropdown#DropdownBase
  * @ui
  * @public
  */
diff --git a/FixedPopupPanels/FixedPopupPanels.js b/FixedPopupPanels/FixedPopupPanels.js
index dca06b8043..1de1168cb5 100644
--- a/FixedPopupPanels/FixedPopupPanels.js
+++ b/FixedPopupPanels/FixedPopupPanels.js
@@ -81,7 +81,7 @@ const FixedPopupPanelsBase = (props) => {
  *
  * @class FixedPopupPanels
  * @memberof sandstone/FixedPopupPanels
- * @extends sandstone/FixedPopupPanels.FixedPopupPanelsBase
+ * @extends sandstone/FixedPopupPanels#FixedPopupPanelsBase
  * @mixes sandstone/FixedPopupPanels.FixedPopupPanelsDecorator
  * @ui
  * @public
@@ -103,7 +103,7 @@ const FixedPopupPanels = FixedPopupPanelsDecorator(FixedPopupPanelsBase);
  * {@link sandstone/FixedPopupPanels.FixedPopupPanels|FixedPopupPanels} view manager instance.
  *
  * @class Panel
- * @extends sandstone/Panels.Panel
+ * @extends sandstone/Panels#Panel
  * @memberof sandstone/FixedPopupPanels
  * @ui
  * @public
@@ -124,7 +124,7 @@ FixedPopupPanels.Panel = Panel;
  * {@link ui/Slottable.Slottable|`slots`} for components.
  *
  * @class Header
- * @extends sandstone/Panels.Header
+ * @extends sandstone/Panels#Header
  * @memberof sandstone/FixedPopupPanels
  * @ui
  * @public
diff --git a/FlexiblePopupPanels/Header.js b/FlexiblePopupPanels/Header.js
index 9a150f34ed..78bf8b2038 100644
--- a/FlexiblePopupPanels/Header.js
+++ b/FlexiblePopupPanels/Header.js
@@ -14,7 +14,7 @@ import css from './FlexiblePopupPanels.module.less';
  * {@link ui/Slottable.Slottable|slots} for components.
  *
  * @class Header
- * @extends sandstone/Panels.Header
+ * @extends sandstone/Panels#Header
  * @memberof sandstone/FlexiblePopupPanels
  * @ui
  * @public
diff --git a/FlexiblePopupPanels/Panel.js b/FlexiblePopupPanels/Panel.js
index 56f3078ce3..56578beacd 100644
--- a/FlexiblePopupPanels/Panel.js
+++ b/FlexiblePopupPanels/Panel.js
@@ -19,7 +19,7 @@ function clamp (val, total) {
  * manager instance.
  *
  * @class Panel
- * @extends sandstone/Panels.Panel
+ * @extends sandstone/Panels#Panel
  * @memberof sandstone/FlexiblePopupPanels
  * @ui
  * @public
diff --git a/FormCheckboxItem/FormCheckboxItem.js b/FormCheckboxItem/FormCheckboxItem.js
index 035fd10322..4193012071 100644
--- a/FormCheckboxItem/FormCheckboxItem.js
+++ b/FormCheckboxItem/FormCheckboxItem.js
@@ -37,7 +37,7 @@ const hasChildren = (children) => (Children.toArray(children).filter(Boolean).le
  *
  * @class FormCheckboxItemBase
  * @memberof sandstone/FormCheckboxItem
- * @extends sandstone/Item.Item
+ * @extends sandstone/Item#Item
  * @ui
  * @public
  */
@@ -177,7 +177,7 @@ const FormCheckboxItemDecorator = compose(
  *
  * @class FormCheckboxItem
  * @memberof sandstone/FormCheckboxItem
- * @extends sandstone/FormCheckboxItem.FormCheckboxItemBase
+ * @extends sandstone/FormCheckboxItem#FormCheckboxItemBase
  * @mixes sandstone/FormCheckboxItem.FormCheckboxItemDecorator
  * @ui
  * @public
diff --git a/Heading/Heading.js b/Heading/Heading.js
index f38daf2089..b97302c7a1 100644
--- a/Heading/Heading.js
+++ b/Heading/Heading.js
@@ -131,7 +131,7 @@ const HeadingDecorator = compose(
  *
  * @class Heading
  * @memberof sandstone/Heading
- * @extends sandstone/Heading.HeadingBase
+ * @extends sandstone/Heading#HeadingBase
  * @mixes sandstone/Heading.HeadingDecorator
  * @ui
  * @public
diff --git a/Icon/Icon.js b/Icon/Icon.js
index 972944fc45..6c6d492cab 100644
--- a/Icon/Icon.js
+++ b/Icon/Icon.js
@@ -30,7 +30,7 @@ import componentCss from './Icon.module.less';
  *
  * @class IconBase
  * @memberof sandstone/Icon
- * @extends ui/Icon.Icon
+ * @extends ui/Icon#Icon
  * @ui
  * @public
  */
@@ -368,7 +368,7 @@ const IconDecorator = compose(
  *
  * @class Icon
  * @memberof sandstone/Icon
- * @extends sandstone/Icon.IconBase
+ * @extends sandstone/Icon#IconBase
  * @mixes sandstone/Icon.IconDecorator
  * @ui
  * @public
diff --git a/Image/Image.js b/Image/Image.js
index 2609560901..f0e5f280d1 100644
--- a/Image/Image.js
+++ b/Image/Image.js
@@ -30,7 +30,7 @@ import componentCss from './Image.module.less';
  *
  * @class ImageBase
  * @memberof sandstone/Image
- * @extends ui/Image.Image
+ * @extends ui/Image#Image
  * @ui
  * @public
  */
@@ -161,7 +161,7 @@ const ImageDecorator = compose(
  *
  * @class Image
  * @memberof sandstone/Image
- * @extends sandstone/Image.ImageBase
+ * @extends sandstone/Image#ImageBase
  * @mixes sandstone/Image.ImageDecorator
  * @ui
  * @public
diff --git a/ImageItem/ImageItem.js b/ImageItem/ImageItem.js
index 3494354038..e758cd1c8d 100644
--- a/ImageItem/ImageItem.js
+++ b/ImageItem/ImageItem.js
@@ -43,7 +43,7 @@ const
  * A Sandstone styled base component for {@link sandstone/ImageItem.ImageItem|ImageItem}.
  *
  * @class ImageItemBase
- * @extends ui/ImageItem.ImageItem
+ * @extends ui/ImageItem#ImageItem
  * @memberof sandstone/ImageItem
  * @ui
  * @public
@@ -336,7 +336,7 @@ const ImageItemDecorator = compose(
  *
  * @class ImageItem
  * @memberof sandstone/ImageItem
- * @extends sandstone/ImageItem.ImageItemBase
+ * @extends sandstone/ImageItem#ImageItemBase
  * @mixes sandstone/ImageItem.ImageItemDecorator
  * @see {@link sandstone/ImageItem.ImageItemBase}
  * @ui
diff --git a/Input/Input.js b/Input/Input.js
index d3aa7adefa..c6d767f5f6 100644
--- a/Input/Input.js
+++ b/Input/Input.js
@@ -629,7 +629,7 @@ const InputDecorator = compose(
  *
  * @class Input
  * @memberof sandstone/Input
- * @extends sandstone/Input.InputBase
+ * @extends sandstone/Input#InputBase
  * @ui
  * @public
  */
@@ -651,7 +651,7 @@ const Input = InputDecorator(InputBase);
  *
  * @class InputPopup
  * @memberof sandstone/Input
- * @extends sandstone/Input.InputPopupBase
+ * @extends sandstone/Input#InputPopupBase
  * @ui
  * @public
  */
diff --git a/Input/InputField.js b/Input/InputField.js
index 3b133abd07..59953e0a75 100644
--- a/Input/InputField.js
+++ b/Input/InputField.js
@@ -372,7 +372,7 @@ const InputFieldDecorator = compose(
  *
  * @class InputField
  * @memberof sandstone/Input
- * @extends sandstone/Input.InputFieldBase
+ * @extends sandstone/Input#InputFieldBase
  * @mixes ui/Changeable.Changeable
  * @mixes spotlight/Spottable.Spottable
  * @mixes sandstone/Skinnable.Skinnable
diff --git a/Item/Item.js b/Item/Item.js
index 1f270776b0..650e310d6f 100644
--- a/Item/Item.js
+++ b/Item/Item.js
@@ -85,7 +85,7 @@ ItemContent.propTypes = {
  *
  * @class ItemBase
  * @memberof sandstone/Item
- * @extends ui/Item.ItemBase
+ * @extends ui/Item#ItemBase
  * @ui
  * @public
  */
@@ -328,7 +328,7 @@ const ItemDecorator = compose(
  *
  * @class Item
  * @memberof sandstone/Item
- * @extends sandstone/Item.ItemBase
+ * @extends sandstone/Item#ItemBase
  * @mixes sandstone/Item.ItemDecorator
  * @ui
  * @public
diff --git a/KeyGuide/KeyGuide.js b/KeyGuide/KeyGuide.js
index 7a191715b8..f724316265 100644
--- a/KeyGuide/KeyGuide.js
+++ b/KeyGuide/KeyGuide.js
@@ -161,7 +161,7 @@ const KeyGuideDecorator = compose(
  *
  * @class KeyGuide
  * @memberof sandstone/KeyGuide
- * @extends sandstone/KeyGuide.KeyGuideBase
+ * @extends sandstone/KeyGuide#KeyGuideBase
  * @mixes sandstone/KeyGuide.KeyGuideDecorator
  * @ui
  * @public
diff --git a/Marquee/Marquee.js b/Marquee/Marquee.js
index 58e9bca18b..f6bcf5c2e3 100644
--- a/Marquee/Marquee.js
+++ b/Marquee/Marquee.js
@@ -42,7 +42,7 @@ export {
 	 *
 	 * @see {@link ui/Marquee.Marquee}
 	 * @class Marquee
-	 * @extends ui/Marquee.Marquee
+	 * @extends ui/Marquee#Marquee
 	 * @memberof sandstone/Marquee
 	 * @ui
 	 * @public
@@ -54,7 +54,7 @@ export {
 	 *
 	 * @see {@link ui/Marquee.Marquee}
 	 * @class MarqueeBase
-	 * @extends ui/Marquee.MarqueeBase
+	 * @extends ui/Marquee#MarqueeBase
 	 * @memberof sandstone/Marquee
 	 * @ui
 	 * @public
@@ -67,7 +67,7 @@ export {
 	 * @see {@link ui/Marquee.MarqueeController}
 	 * @hoc
 	 * @name MarqueeController
-	 * @extends ui/Marquee.MarqueeController
+	 * @extends ui/Marquee#MarqueeController
 	 * @memberof sandstone/Marquee
 	 * @public
 	 */
@@ -79,7 +79,7 @@ export {
 	 * @see {@link ui/Marquee.MarqueeDecorator}
 	 * @hoc
 	 * @name MarqueeDecorator
-	 * @extends ui/Marquee.MarqueeDecorator
+	 * @extends ui/Marquee#MarqueeDecorator
 	 * @memberof sandstone/Marquee
 	 * @public
 	 */
diff --git a/MediaOverlay/MediaOverlay.js b/MediaOverlay/MediaOverlay.js
index de6005d4bc..ed9adf0431 100644
--- a/MediaOverlay/MediaOverlay.js
+++ b/MediaOverlay/MediaOverlay.js
@@ -291,7 +291,7 @@ const MediaOverlayDecorator = compose(
  *
  * @class MediaOverlay
  * @memberof sandstone/MediaOverlay
- * @extends sandstone/MediaOverlay.MediaOverlayBase
+ * @extends sandstone/MediaOverlay#MediaOverlayBase
  * @mixes sandstone/MediaOverlay.MediaOverlayDecorator
  * @ui
  * @public
diff --git a/MediaPlayer/MediaSlider.js b/MediaPlayer/MediaSlider.js
index 887f9b42bf..3074d0e781 100644
--- a/MediaPlayer/MediaSlider.js
+++ b/MediaPlayer/MediaSlider.js
@@ -106,7 +106,7 @@ const MediaSliderBase = kind({
  * {@link sandstone/VideoPlayer.VideoPlayer|VideoPlayer}.
  *
  * @class MediaSlider
- * @extends sandstone/Slider.Slider
+ * @extends sandstone/Slider#Slider
  * @memberof sandstone/MediaPlayer
  * @ui
  * @public
diff --git a/Panels/index.js b/Panels/index.js
index f3606b4d6c..164eda9bdb 100644
--- a/Panels/index.js
+++ b/Panels/index.js
@@ -31,7 +31,7 @@ export {
 	 * @see {@link ui/Routable.Routable}
 	 * @hoc
 	 * @name Routable
-	 * @extends ui/Routable.Routable
+	 * @extends ui/Routable#Routable
 	 * @memberof sandstone/Panels
 	 * @public
 	 */
@@ -44,7 +44,7 @@ export {
 	 * @see {@link ui/Routable.Route}
 	 * @ui
 	 * @name Route
-	 * @extends ui/Routable.Route
+	 * @extends ui/Routable#Route
 	 * @memberof sandstone/Panels
 	 * @public
 	 */
diff --git a/Picker/Picker.js b/Picker/Picker.js
index 91ce32e7fe..858df24eab 100644
--- a/Picker/Picker.js
+++ b/Picker/Picker.js
@@ -345,7 +345,7 @@ const PickerBase = kind({
  *
  * @class Picker
  * @memberof sandstone/Picker
- * @extends sandstone/Picker.PickerBase
+ * @extends sandstone/Picker#PickerBase
  * @mixes ui/Changeable.Changeable
  * @mixes sandstone/Marquee.MarqueeController
  * @ui
diff --git a/Popup/Popup.js b/Popup/Popup.js
index 0270da34c6..a752ce82af 100644
--- a/Popup/Popup.js
+++ b/Popup/Popup.js
@@ -273,7 +273,7 @@ const OpenState = {
  *
  * @class Popup
  * @memberof sandstone/Popup
- * @extends sandstone/Popup.PopupBase
+ * @extends sandstone/Popup#PopupBase
  * @ui
  * @public
  */
diff --git a/PopupTabLayout/PopupTabLayout.js b/PopupTabLayout/PopupTabLayout.js
index 58ef2719a8..a907773458 100644
--- a/PopupTabLayout/PopupTabLayout.js
+++ b/PopupTabLayout/PopupTabLayout.js
@@ -38,8 +38,8 @@ const popupPropList = ['noAutoDismiss', 'onHide', 'onKeyDown', 'onShow', 'open',
  *
  * @class PopupTabLayoutBase
  * @memberof sandstone/PopupTabLayout
- * @extends sandstone/Popup.Popup
- * @extends sandstone/TabLayout.TabLayout
+ * @extends sandstone/Popup#Popup
+ * @extends sandstone/TabLayout#TabLayout
  * @ui
  * @public
  */
@@ -345,7 +345,7 @@ const PopupTabLayout = PopupTabLayoutDecorator(PopupTabLayoutBase);
  * @name Tab
  * @type {sandstone/PopupTabLayout.Tab}
  * @memberof sandstone/PopupTabLayout.PopupTabLayout
- * @extends sandstone/TabLayout.Tab
+ * @extends sandstone/TabLayout#Tab
  */
 PopupTabLayout.Tab = Tab;
 
@@ -354,7 +354,7 @@ PopupTabLayout.Tab = Tab;
  *
  * @class Tab
  * @memberof sandstone/PopupTabLayout
- * @extends sandstone/TabLayout.Tab
+ * @extends sandstone/TabLayout#Tab
  * @ui
  */
 
@@ -401,7 +401,7 @@ const tabPanelsHandlers = {
  *
  * @class TabPanelsBase
  * @memberof sandstone/PopupTabLayout
- * @extends sandstone/Panels.Panels
+ * @extends sandstone/Panels#Panels
  * @ui
  * @public
  */
@@ -421,7 +421,7 @@ TabPanelsBase.propTypes = {
  *
  * @class TabPanels
  * @memberof sandstone/PopupTabLayout
- * @extends sandstone/PopupTabLayout.TabPanelsBase
+ * @extends sandstone/PopupTabLayout#TabPanelsBase
  * @ui
  * @public
  */
@@ -452,7 +452,7 @@ const TabPanels = I18nContextDecorator(
  *
  * @class TabPanel
  * @memberof sandstone/PopupTabLayout
- * @extends sandstone/Panels.Panel
+ * @extends sandstone/Panels#Panel
  * @ui
  * @public
  */
diff --git a/ProgressBar/ProgressBar.js b/ProgressBar/ProgressBar.js
index 9a334e77c5..b3234b4dc9 100644
--- a/ProgressBar/ProgressBar.js
+++ b/ProgressBar/ProgressBar.js
@@ -200,7 +200,7 @@ const ProgressBarDecorator = compose(
  *
  * @class ProgressBar
  * @memberof sandstone/ProgressBar
- * @extends sandstone/ProgressBar.ProgressBarBase
+ * @extends sandstone/ProgressBar#ProgressBarBase
  * @mixes sandstone/ProgressBar.ProgressBarDecorator
  * @ui
  * @public
diff --git a/ProgressButton/ProgressButton.js b/ProgressButton/ProgressButton.js
index bf06950a92..893ea1677e 100644
--- a/ProgressButton/ProgressButton.js
+++ b/ProgressButton/ProgressButton.js
@@ -24,8 +24,8 @@ import componentCss from './ProgressButton.module.less';
  *
  * @class ProgressButtonBase
  * @memberof sandstone/ProgressButton
- * @extends sandstone/Button.ButtonBase
- * @extends sandstone/ProgressBar.ProgressBar
+ * @extends sandstone/Button#ButtonBase
+ * @extends sandstone/ProgressBar#ProgressBar
  * @ui
  * @public
  */
@@ -126,7 +126,7 @@ const ProgressButtonBase = kind({
  *
  * @class ProgressButton
  * @memberof sandstone/ProgressButton
- * @extends sandstone/ProgressButton.ProgressButtonBase
+ * @extends sandstone/ProgressButton#ProgressButtonBase
  * @ui
  * @public
  */
diff --git a/RadioItem/RadioItem.js b/RadioItem/RadioItem.js
index 1daa840dd8..57f9a6bf17 100644
--- a/RadioItem/RadioItem.js
+++ b/RadioItem/RadioItem.js
@@ -31,7 +31,7 @@ const Item = ItemDecorator(ItemBase);
  *
  * @class RadioItemBase
  * @memberof sandstone/RadioItem
- * @extends sandstone/Item.Item
+ * @extends sandstone/Item#Item
  * @ui
  * @public
  */
@@ -126,7 +126,7 @@ const RadioItemDecorator = compose(
  *
  * @class RadioItem
  * @memberof sandstone/RadioItem
- * @extends sandstone/RadioItem.RadioItemBase
+ * @extends sandstone/RadioItem#RadioItemBase
  * @mixes sandstone/RadioItem.RadioItemDecorator
  * @ui
  * @public
diff --git a/Scroller/Scroller.js b/Scroller/Scroller.js
index ea65d0f456..f23c178e51 100644
--- a/Scroller/Scroller.js
+++ b/Scroller/Scroller.js
@@ -48,7 +48,7 @@ let scrollerId = 0;
  *
  * @class Scroller
  * @memberof sandstone/Scroller
- * @extends ui/Scroller.ScrollerBasic
+ * @extends ui/Scroller#ScrollerBasic
  * @ui
  * @public
  */
diff --git a/Skinnable/Skinnable.js b/Skinnable/Skinnable.js
index d85a6c7453..f515a00235 100644
--- a/Skinnable/Skinnable.js
+++ b/Skinnable/Skinnable.js
@@ -31,7 +31,7 @@ const defaultConfig = {
  *
  * @class Skinnable
  * @memberof sandstone/Skinnable
- * @extends ui/Skinnable.Skinnable
+ * @extends ui/Skinnable#Skinnable
  * @hoc
  * @public
  */
diff --git a/Slider/Slider.js b/Slider/Slider.js
index 2eeaf0aa11..252af1aa63 100644
--- a/Slider/Slider.js
+++ b/Slider/Slider.js
@@ -52,7 +52,7 @@ import componentCss from './Slider.module.less';
  * Range-selection input component.
  *
  * @class SliderBase
- * @extends ui/Slider.SliderBase
+ * @extends ui/Slider#SliderBase
  * @omit progressBarComponent
  * @memberof sandstone/Slider
  * @ui
diff --git a/Spinner/Spinner.js b/Spinner/Spinner.js
index ef5e415661..45cd1fdf12 100644
--- a/Spinner/Spinner.js
+++ b/Spinner/Spinner.js
@@ -82,7 +82,7 @@ const SpinnerCore = kind({
  *
  * @class SpinnerBase
  * @memberof sandstone/Spinner
- * @extends ui/Spinner.SpinnerBase
+ * @extends ui/Spinner#SpinnerBase
  * @ui
  * @public
  */
@@ -237,7 +237,7 @@ const SpinnerDecorator = compose(
  *
  * @class Spinner
  * @memberof sandstone/Spinner
- * @extends sandstone/Spinner.SpinnerBase
+ * @extends sandstone/Spinner#SpinnerBase
  * @mixes sandstone/Spinner.SpinnerDecorator
  * @ui
  * @public
diff --git a/Steps/Steps.js b/Steps/Steps.js
index ba5c872291..8f1430b4f6 100644
--- a/Steps/Steps.js
+++ b/Steps/Steps.js
@@ -255,7 +255,7 @@ const StepsDecorator = compose(
  *
  * @class Steps
  * @memberof sandstone/Steps
- * @extends sandstone/Steps.StepsBase
+ * @extends sandstone/Steps#StepsBase
  * @mixes sandstone/Steps.StepsDecorator
  * @ui
  * @public
diff --git a/Switch/Switch.js b/Switch/Switch.js
index 9b6d248f4b..aadbe27cef 100644
--- a/Switch/Switch.js
+++ b/Switch/Switch.js
@@ -27,7 +27,7 @@ import componentCss from './Switch.module.less';
  *
  * @class SwitchBase
  * @memberof sandstone/Switch
- * @extends sandstone/Icon.Icon
+ * @extends sandstone/Icon#Icon
  * @ui
  * @public
  */
@@ -136,7 +136,7 @@ const SwitchDecorator = compose(
  *
  * @class Switch
  * @memberof sandstone/Switch
- * @extends sandstone/Switch.SwitchBase
+ * @extends sandstone/Switch#SwitchBase
  * @mixes sandstone/Switch.SwitchDecorator
  * @ui
  * @public
diff --git a/SwitchItem/SwitchItem.js b/SwitchItem/SwitchItem.js
index d18b8efdd4..fe2cd7a2d2 100644
--- a/SwitchItem/SwitchItem.js
+++ b/SwitchItem/SwitchItem.js
@@ -34,7 +34,7 @@ Switch.displayName = 'Switch';
  *
  * @class SwitchItemBase
  * @memberof sandstone/SwitchItem
- * @extends sandstone/Item.Item
+ * @extends sandstone/Item#Item
  * @omit iconComponent
  * @ui
  * @public
@@ -124,7 +124,7 @@ const SwitchItemDecorator = compose(
  *
  * @class SwitchItem
  * @memberof sandstone/SwitchItem
- * @extends sandstone/SwitchItem.SwitchItemBase
+ * @extends sandstone/SwitchItem#SwitchItemBase
  * @mixes sandstone/SwitchItem.SwitchItemDecorator
  * @ui
  * @public
diff --git a/VirtualList/VirtualList.js b/VirtualList/VirtualList.js
index 8cfe20bcef..49120923dd 100644
--- a/VirtualList/VirtualList.js
+++ b/VirtualList/VirtualList.js
@@ -28,7 +28,7 @@ const nop = () => {};
  *
  * @class VirtualList
  * @memberof sandstone/VirtualList
- * @extends ui/VirtualList.VirtualListBasic
+ * @extends ui/VirtualList#VirtualListBasic
  * @ui
  * @public
  */
@@ -518,7 +518,7 @@ VirtualList.defaultProps = {
  *
  * @class VirtualGridList
  * @memberof sandstone/VirtualList
- * @extends ui/VirtualList.VirtualListBasic
+ * @extends ui/VirtualList#VirtualListBasic
  * @ui
  * @public
  */
diff --git a/WizardPanels/WizardPanels.js b/WizardPanels/WizardPanels.js
index 830b9285d7..07daf32cc2 100644
--- a/WizardPanels/WizardPanels.js
+++ b/WizardPanels/WizardPanels.js
@@ -670,7 +670,7 @@ const WizardPanelsDecorator = compose(
  *
  * @class WizardPanels
  * @memberof sandstone/WizardPanels
- * @extends sandstone/WizardPanels.WizardPanelsBase
+ * @extends sandstone/WizardPanels#WizardPanelsBase
  * @mixes ui/Changeable.Changeable
  * @ui
  * @public