diff --git a/src/components/Map/DynamicGoogleMap.js b/src/components/Map/DynamicGoogleMap.js
index d8515430..92aade43 100644
--- a/src/components/Map/DynamicGoogleMap.js
+++ b/src/components/Map/DynamicGoogleMap.js
@@ -4,10 +4,10 @@ import { withGoogleMap, GoogleMap, Marker, Circle } from 'react-google-maps';
 import config from '../../config';
 
 /**
- * DynamicMap uses withGoogleMap HOC.
+ * DynamicGoogleMap uses withGoogleMap HOC.
  * It handles some of the google map initialization states.
  */
-const DynamicMap = withGoogleMap(props => {
+const DynamicGoogleMap = withGoogleMap(props => {
   const { center, zoom, address, coordinatesConfig } = props;
 
   const { markerURI, anchorX, anchorY, width, height } = coordinatesConfig.customMarker || {};
@@ -53,14 +53,14 @@ const DynamicMap = withGoogleMap(props => {
   );
 });
 
-DynamicMap.defaultProps = {
+DynamicGoogleMap.defaultProps = {
   address: '',
   center: null,
   zoom: config.coordinates.fuzzy ? config.coordinates.fuzzyDefaultZoomLevel : 11,
   coordinatesConfig: config.coordinates,
 };
 
-DynamicMap.propTypes = {
+DynamicGoogleMap.propTypes = {
   address: string,
   center: shape({
     lat: number.isRequired,
@@ -70,4 +70,4 @@ DynamicMap.propTypes = {
   coordinatesConfig: object,
 };
 
-export default DynamicMap;
+export default DynamicGoogleMap;
diff --git a/src/components/Map/StaticGoogleMap.js b/src/components/Map/StaticGoogleMap.js
index 694e5109..b911eff5 100644
--- a/src/components/Map/StaticGoogleMap.js
+++ b/src/components/Map/StaticGoogleMap.js
@@ -108,7 +108,7 @@ const customMarker = (options, lat, lng) => {
   return [`anchor:${anchorX},${anchorY}`, `icon:${markerURI}`, `${lat},${lng}`].join('|');
 };
 
-class StaticMap extends Component {
+class StaticGoogleMap extends Component {
   shouldComponentUpdate(nextProps, prevState) {
     // Do not draw the map unless center, zoom or dimensions change
     // We want to prevent unnecessary calls to Google Maps APIs due
@@ -147,7 +147,7 @@ class StaticMap extends Component {
   }
 }
 
-StaticMap.defaultProps = {
+StaticGoogleMap.defaultProps = {
   className: null,
   rootClassName: null,
   address: '',
@@ -156,7 +156,7 @@ StaticMap.defaultProps = {
   coordinatesConfig: config.coordinates,
 };
 
-StaticMap.propTypes = {
+StaticGoogleMap.propTypes = {
   className: string,
   rootClassName: string,
   address: string,
@@ -174,4 +174,4 @@ StaticMap.propTypes = {
   }).isRequired,
 };
 
-export default lazyLoadWithDimensions(StaticMap, { maxWidth: '640px' });
+export default lazyLoadWithDimensions(StaticGoogleMap, { maxWidth: '640px' });