diff --git a/src/components/autocomplete.vue b/src/components/autocomplete.vue
index 07cba0e..c5ab04f 100644
--- a/src/components/autocomplete.vue
+++ b/src/components/autocomplete.vue
@@ -5,7 +5,7 @@
 <script>
 import { bindProps, getPropsValues } from '../utils/bindProps.js'
 import downArrowSimulator from '../utils/simulateArrowDown.js'
-import { mappedPropsToVueProps } from './mapElementFactory'
+import { mappedPropsToVueProps } from './build-component'
 
 const mappedProps = {
   bounds: {
diff --git a/src/components/autocompleteImpl.js b/src/components/autocompleteImpl.js
index 7ef8f77..f79a641 100644
--- a/src/components/autocompleteImpl.js
+++ b/src/components/autocompleteImpl.js
@@ -1,6 +1,6 @@
 import { bindProps, getPropsValues } from '../utils/bindProps.js'
 import downArrowSimulator from '../utils/simulateArrowDown.js'
-import { mappedPropsToVueProps } from './mapElementFactory'
+import { mappedPropsToVueProps } from './build-component'
 
 const mappedProps = {
   bounds: {
diff --git a/src/components/mapElementFactory.js b/src/components/build-component.js
similarity index 100%
rename from src/components/mapElementFactory.js
rename to src/components/build-component.js
diff --git a/src/components/circle.js b/src/components/circle.js
index 8dadcf9..9dacff5 100644
--- a/src/components/circle.js
+++ b/src/components/circle.js
@@ -1,4 +1,4 @@
-import mapElementFactory from './mapElementFactory'
+import buildComponent from './build-component'
 
 const props = {
   center: {
@@ -38,7 +38,7 @@ const events = [
   'rightclick',
 ]
 
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   name: 'circle',
   ctr: () => google.maps.Circle,
diff --git a/src/components/cluster.vue b/src/components/cluster.vue
index 2a1c856..4e95470 100644
--- a/src/components/cluster.vue
+++ b/src/components/cluster.vue
@@ -3,7 +3,7 @@
 </template>
 <script>
 import MarkerClusterer from 'marker-clusterer-plus'
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 const props = {
   maxZoom: {
     type: Number,
@@ -68,7 +68,7 @@ const events = [
   'mouseout',
 ]
 
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   events,
   name: 'cluster',
diff --git a/src/components/infoWindow.vue b/src/components/infoWindow.vue
index 3675770..cdd77ab 100644
--- a/src/components/infoWindow.vue
+++ b/src/components/infoWindow.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 
 const props = {
   options: {
@@ -29,7 +29,7 @@ const props = {
 
 const events = ['domready', 'closeclick', 'content_changed']
 
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   events,
   name: 'infoWindow',
diff --git a/src/components/map.vue b/src/components/map.vue
index c133225..9b10eb1 100644
--- a/src/components/map.vue
+++ b/src/components/map.vue
@@ -15,7 +15,7 @@ import mountableMixin from '../utils/mountableMixin.js'
 
 import TwoWayBindingWrapper from '../utils/TwoWayBindingWrapper.js'
 import WatchPrimitiveProperties from '../utils/WatchPrimitiveProperties.js'
-import { mappedPropsToVueProps } from './mapElementFactory.js'
+import { mappedPropsToVueProps } from './build-component.js'
 
 const props = {
   center: {
diff --git a/src/components/mapImpl.js b/src/components/mapImpl.js
index 417b50e..9b0d870 100644
--- a/src/components/mapImpl.js
+++ b/src/components/mapImpl.js
@@ -4,7 +4,7 @@ import mountableMixin from '../utils/mountableMixin.js'
 
 import TwoWayBindingWrapper from '../utils/TwoWayBindingWrapper.js'
 import WatchPrimitiveProperties from '../utils/WatchPrimitiveProperties.js'
-import { mappedPropsToVueProps } from './mapElementFactory.js'
+import { mappedPropsToVueProps } from './build-component.js'
 
 const props = {
   center: {
diff --git a/src/components/marker.js b/src/components/marker.js
index 094e0af..37183df 100644
--- a/src/components/marker.js
+++ b/src/components/marker.js
@@ -1,4 +1,4 @@
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 
 const props = {
   animation: {
@@ -83,7 +83,7 @@ const events = [
  * reasons. Otherwise we should use a cluster-marker mixin or
  * subclass.
  */
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   events,
   name: 'marker',
diff --git a/src/components/polygon.js b/src/components/polygon.js
index 0c36812..11eac40 100644
--- a/src/components/polygon.js
+++ b/src/components/polygon.js
@@ -1,4 +1,4 @@
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 
 const props = {
   draggable: {
@@ -36,7 +36,7 @@ const events = [
   'rightclick',
 ]
 
-export default mapElementFactory({
+export default buildComponent({
   props: {
     deepWatch: {
       type: Boolean,
diff --git a/src/components/polyline.js b/src/components/polyline.js
index f60c97b..112c52b 100644
--- a/src/components/polyline.js
+++ b/src/components/polyline.js
@@ -1,4 +1,4 @@
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 
 const props = {
   draggable: {
@@ -31,7 +31,7 @@ const events = [
   'rightclick',
 ]
 
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   props: {
     deepWatch: {
diff --git a/src/components/rectangle.js b/src/components/rectangle.js
index 9d4f298..aab98da 100644
--- a/src/components/rectangle.js
+++ b/src/components/rectangle.js
@@ -1,4 +1,4 @@
-import mapElementFactory from './mapElementFactory.js'
+import buildComponent from './build-component.js'
 
 const props = {
   bounds: {
@@ -33,7 +33,7 @@ const events = [
   'rightclick',
 ]
 
-export default mapElementFactory({
+export default buildComponent({
   mappedProps: props,
   name: 'rectangle',
   ctr: () => google.maps.Rectangle,
diff --git a/src/main.js b/src/main.js
index a014b86..53f7c9c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,7 @@ import Map from './components/map.vue'
 import Autocomplete from './components/autocomplete.vue'
 
 import MapElementMixin from './components/mapElementMixin'
-import MapElementFactory from './components/mapElementFactory'
+import buildComponent from './components/build-component'
 import MountableMixin from './utils/mountableMixin'
 import {Env} from "./utils/env";
 let GmapApi = null
@@ -28,7 +28,7 @@ export {
   InfoWindow,
   Map,
   MapElementMixin,
-  MapElementFactory,
+  buildComponent,
   Autocomplete,
   MountableMixin,
 }