diff --git a/js/common/view/AmplitudeSlider.js b/js/common/view/AmplitudeSlider.js
index f4b0a555..cb02e1e6 100644
--- a/js/common/view/AmplitudeSlider.js
+++ b/js/common/view/AmplitudeSlider.js
@@ -13,7 +13,7 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
 import Range from '../../../../dot/js/Range.js';
 import Utils from '../../../../dot/js/Utils.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import Orientation from '../../../../phet-core/js/Orientation.js';
 import { PressListener } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/CalipersNode.js b/js/common/view/CalipersNode.js
index 96a26c66..6578d3c3 100644
--- a/js/common/view/CalipersNode.js
+++ b/js/common/view/CalipersNode.js
@@ -8,7 +8,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import BackgroundNode from '../../../../scenery-phet/js/BackgroundNode.js';
 import { Node } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/DomainChartNode.js b/js/common/view/DomainChartNode.js
index d34b70f8..21736730 100644
--- a/js/common/view/DomainChartNode.js
+++ b/js/common/view/DomainChartNode.js
@@ -21,7 +21,7 @@ import TickLabelSet from '../../../../bamboo/js/TickLabelSet.js';
 import TickMarkSet from '../../../../bamboo/js/TickMarkSet.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Range from '../../../../dot/js/Range.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import Orientation from '../../../../phet-core/js/Orientation.js';
 import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
diff --git a/js/common/view/HarmonicsChartNode.js b/js/common/view/HarmonicsChartNode.js
index 2928d90b..8ad8650a 100644
--- a/js/common/view/HarmonicsChartNode.js
+++ b/js/common/view/HarmonicsChartNode.js
@@ -8,7 +8,7 @@
  */
 
 import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Color } from '../../../../scenery/js/imports.js';
 import HarmonicPlot from '../../discrete/view/HarmonicPlot.js';
diff --git a/js/common/view/SumChartNode.js b/js/common/view/SumChartNode.js
index dff272f2..29db1233 100644
--- a/js/common/view/SumChartNode.js
+++ b/js/common/view/SumChartNode.js
@@ -9,7 +9,7 @@
 
 import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js';
 import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
 import FMWColors from '../FMWColors.js';
diff --git a/js/discrete/view/PeriodClockNode.js b/js/discrete/view/PeriodClockNode.js
index c839b5a0..df198e49 100644
--- a/js/discrete/view/PeriodClockNode.js
+++ b/js/discrete/view/PeriodClockNode.js
@@ -9,7 +9,7 @@
  */
 
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
 import { Circle } from '../../../../scenery/js/imports.js';
diff --git a/js/wavepacket/view/GaussianAreaPlot.js b/js/wavepacket/view/GaussianAreaPlot.js
index 95aaa9f1..0c6081f7 100644
--- a/js/wavepacket/view/GaussianAreaPlot.js
+++ b/js/wavepacket/view/GaussianAreaPlot.js
@@ -13,7 +13,7 @@
  */
 
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Path } from '../../../../scenery/js/imports.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
diff --git a/js/wavepacket/view/HorizontalDimensionalArrowsNode.js b/js/wavepacket/view/HorizontalDimensionalArrowsNode.js
index 3c562039..291082cb 100644
--- a/js/wavepacket/view/HorizontalDimensionalArrowsNode.js
+++ b/js/wavepacket/view/HorizontalDimensionalArrowsNode.js
@@ -11,7 +11,7 @@
 import Dimension2 from '../../../../dot/js/Dimension2.js';
 import Matrix3 from '../../../../dot/js/Matrix3.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Line } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
diff --git a/js/wavepacket/view/WavePacketAmplitudesChartNode.js b/js/wavepacket/view/WavePacketAmplitudesChartNode.js
index 3fb9d388..e002f66b 100644
--- a/js/wavepacket/view/WavePacketAmplitudesChartNode.js
+++ b/js/wavepacket/view/WavePacketAmplitudesChartNode.js
@@ -12,7 +12,7 @@ import BarPlot from '../../../../bamboo/js/BarPlot.js';
 import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js';
 import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js';
 import Range from '../../../../dot/js/Range.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import { Color } from '../../../../scenery/js/imports.js';