diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js
index 5c16dddcd6..fe38d14b3b 100644
--- a/src/ol/geom/geometry.js
+++ b/src/ol/geom/geometry.js
@@ -13,7 +13,7 @@ goog.require('ol.geom.flat');
 /**
  * @enum {string}
  */
-ol.geom.Type = {
+ol.geom.GeometryType = {
   POINT: 'Point',
   LINE_STRING: 'LineString',
   LINEAR_RING: 'LinearRing',
@@ -196,7 +196,7 @@ ol.geom.Geometry.prototype.getStride = function() {
 
 
 /**
- * @return {ol.geom.Type} Geometry type.
+ * @return {ol.geom.GeometryType} Geometry type.
  */
 ol.geom.Geometry.prototype.getType = goog.abstractMethod;
 
diff --git a/src/ol/geom/linearring.js b/src/ol/geom/linearring.js
index a4b6bff880..db91862cf4 100644
--- a/src/ol/geom/linearring.js
+++ b/src/ol/geom/linearring.js
@@ -40,7 +40,7 @@ ol.geom.LinearRing.prototype.getCoordinates = function() {
  * @inheritDoc
  */
 ol.geom.LinearRing.prototype.getType = function() {
-  return ol.geom.Type.LINEAR_RING;
+  return ol.geom.GeometryType.LINEAR_RING;
 };
 
 
diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js
index 99f0dc542f..40b231674f 100644
--- a/src/ol/geom/linestring.js
+++ b/src/ol/geom/linestring.js
@@ -40,7 +40,7 @@ ol.geom.LineString.prototype.getLength = function() {
  * @inheritDoc
  */
 ol.geom.LineString.prototype.getType = function() {
-  return ol.geom.Type.LINE_STRING;
+  return ol.geom.GeometryType.LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js
index c52a870b0b..3f255fba11 100644
--- a/src/ol/geom/multilinestring.js
+++ b/src/ol/geom/multilinestring.js
@@ -64,7 +64,7 @@ ol.geom.MultiLineString.prototype.getLineStrings = function() {
  * @inheritDoc
  */
 ol.geom.MultiLineString.prototype.getType = function() {
-  return ol.geom.Type.MULTI_LINE_STRING;
+  return ol.geom.GeometryType.MULTI_LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/multipoint.js b/src/ol/geom/multipoint.js
index 942d58f9c8..3092b41284 100644
--- a/src/ol/geom/multipoint.js
+++ b/src/ol/geom/multipoint.js
@@ -47,7 +47,7 @@ ol.geom.MultiPoint.prototype.getPoints = function() {
  * @inheritDoc
  */
 ol.geom.MultiPoint.prototype.getType = function() {
-  return ol.geom.Type.MULTI_POINT;
+  return ol.geom.GeometryType.MULTI_POINT;
 };
 
 
diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js
index d5293373d7..b9becbc382 100644
--- a/src/ol/geom/multipolygon.js
+++ b/src/ol/geom/multipolygon.js
@@ -109,7 +109,7 @@ ol.geom.MultiPolygon.prototype.getPolygons = function() {
  * @inheritDoc
  */
 ol.geom.MultiPolygon.prototype.getType = function() {
-  return ol.geom.Type.MULTI_POLYGON;
+  return ol.geom.GeometryType.MULTI_POLYGON;
 };
 
 
diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js
index 3f8ac78314..13a9973d7f 100644
--- a/src/ol/geom/point.js
+++ b/src/ol/geom/point.js
@@ -46,7 +46,7 @@ ol.geom.Point.prototype.getExtent = function(opt_extent) {
  * @inheritDoc
  */
 ol.geom.Point.prototype.getType = function() {
-  return ol.geom.Type.POINT;
+  return ol.geom.GeometryType.POINT;
 };
 
 
diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js
index 6f1181434d..1a4f7ff944 100644
--- a/src/ol/geom/polygon.js
+++ b/src/ol/geom/polygon.js
@@ -108,7 +108,7 @@ ol.geom.Polygon.prototype.getLinearRings = function() {
  * @inheritDoc
  */
 ol.geom.Polygon.prototype.getType = function() {
-  return ol.geom.Type.POLYGON;
+  return ol.geom.GeometryType.POLYGON;
 };
 
 
diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js
index 9b7782a0a1..bdf1538b3e 100644
--- a/src/ol/render/canvas/canvasimmediate.js
+++ b/src/ol/render/canvas/canvasimmediate.js
@@ -467,7 +467,7 @@ ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) {
 /**
  * @const
  * @private
- * @type {Object.<ol.geom.Type,
+ * @type {Object.<ol.geom.GeometryType,
  *                function(this: ol.render.canvas.Immediate, ol.geom.Geometry,
  *                         Object)>}
  */
diff --git a/src/ol/render/vector.js b/src/ol/render/vector.js
index f6858f25a2..e737e533d9 100644
--- a/src/ol/render/vector.js
+++ b/src/ol/render/vector.js
@@ -155,7 +155,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
 /**
  * @const
  * @private
- * @type {Object.<ol.geom.Type,
+ * @type {Object.<ol.geom.GeometryType,
  *                function(ol.render.IReplayGroup, ol.geom.Geometry,
  *                         ol.style.Style, Object)>}
  */