diff --git a/src/ol/feature.js b/src/ol/feature.js
index 98895fe593..8c4b5c4b4a 100644
--- a/src/ol/feature.js
+++ b/src/ol/feature.js
@@ -84,7 +84,7 @@ ol.Feature.prototype.getGeometry = function() {
/**
- * @return {Array.
} Symbolizer literals.
+ * @return {Array.} Symbolizer literals.
*/
ol.Feature.prototype.getSymbolizerLiterals = function() {
var symbolizerLiterals = null;
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js
index e024064f7f..2098cab13a 100644
--- a/src/ol/layer/vectorlayer.js
+++ b/src/ol/layer/vectorlayer.js
@@ -409,7 +409,7 @@ ol.layer.Vector.prototype.groupFeaturesBySymbolizerLiteral =
uniqueLiterals[key] = featuresBySymbolizer.length;
featuresBySymbolizer.push([
/** @type {Array.} */ ([]),
- /** @type {ol.style.SymbolizerLiteral} */ (literal),
+ /** @type {ol.style.Literal} */ (literal),
/** @type {Array} */ ([])
]);
}
diff --git a/src/ol/renderer/canvas/canvasvectorrenderer.js b/src/ol/renderer/canvas/canvasvectorrenderer.js
index c2608eee82..c00576d5a8 100644
--- a/src/ol/renderer/canvas/canvasvectorrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorrenderer.js
@@ -23,7 +23,7 @@ goog.require('ol.style.PointLiteral');
goog.require('ol.style.PolygonLiteral');
goog.require('ol.style.ShapeLiteral');
goog.require('ol.style.ShapeType');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
goog.require('ol.style.TextLiteral');
@@ -101,7 +101,7 @@ ol.renderer.canvas.VectorRenderer.prototype.getMaxSymbolSize = function() {
/**
* @param {ol.geom.GeometryType} type Geometry type.
* @param {Array.} features Array of features.
- * @param {ol.style.SymbolizerLiteral} symbolizer Symbolizer.
+ * @param {ol.style.Literal} symbolizer Symbolizer.
* @param {Array} data Additional data.
* @return {boolean} true if deferred, false if rendered.
*/
diff --git a/src/ol/style/line.js b/src/ol/style/line.js
index 2031804bf6..e21042e484 100644
--- a/src/ol/style/line.js
+++ b/src/ol/style/line.js
@@ -6,7 +6,7 @@ goog.require('ol.expr');
goog.require('ol.expr.Expression');
goog.require('ol.expr.Literal');
goog.require('ol.style.Symbolizer');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
/**
@@ -20,7 +20,7 @@ ol.style.LineLiteralOptions;
/**
* @constructor
- * @extends {ol.style.SymbolizerLiteral}
+ * @extends {ol.style.Literal}
* @param {ol.style.LineLiteralOptions} options Line literal options.
*/
ol.style.LineLiteral = function(options) {
@@ -42,7 +42,7 @@ ol.style.LineLiteral = function(options) {
this.strokeWidth = options.strokeWidth;
};
-goog.inherits(ol.style.LineLiteral, ol.style.SymbolizerLiteral);
+goog.inherits(ol.style.LineLiteral, ol.style.Literal);
/**
diff --git a/src/ol/style/point.js b/src/ol/style/point.js
index 20587391d1..147be51dfb 100644
--- a/src/ol/style/point.js
+++ b/src/ol/style/point.js
@@ -2,18 +2,18 @@ goog.provide('ol.style.Point');
goog.provide('ol.style.PointLiteral');
goog.require('ol.style.Symbolizer');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
/**
* @constructor
- * @extends {ol.style.SymbolizerLiteral}
+ * @extends {ol.style.Literal}
*/
ol.style.PointLiteral = function() {
goog.base(this);
};
-goog.inherits(ol.style.PointLiteral, ol.style.SymbolizerLiteral);
+goog.inherits(ol.style.PointLiteral, ol.style.Literal);
diff --git a/src/ol/style/polygon.js b/src/ol/style/polygon.js
index 258fa8775a..4e158fc45d 100644
--- a/src/ol/style/polygon.js
+++ b/src/ol/style/polygon.js
@@ -6,7 +6,7 @@ goog.require('ol.expr');
goog.require('ol.expr.Expression');
goog.require('ol.expr.Literal');
goog.require('ol.style.Symbolizer');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
/**
@@ -22,7 +22,7 @@ ol.style.PolygonLiteralOptions;
/**
* @constructor
- * @extends {ol.style.SymbolizerLiteral}
+ * @extends {ol.style.Literal}
* @param {ol.style.PolygonLiteralOptions} options Polygon literal options.
*/
ol.style.PolygonLiteral = function(options) {
@@ -72,7 +72,7 @@ ol.style.PolygonLiteral = function(options) {
'strokeColor and strokeOpacity and strokeWidth must be set');
};
-goog.inherits(ol.style.PolygonLiteral, ol.style.SymbolizerLiteral);
+goog.inherits(ol.style.PolygonLiteral, ol.style.Literal);
/**
diff --git a/src/ol/style/style.js b/src/ol/style/style.js
index 07edb53086..40875ef7f3 100644
--- a/src/ol/style/style.js
+++ b/src/ol/style/style.js
@@ -3,7 +3,7 @@ goog.provide('ol.style.Style');
goog.require('ol.Feature');
goog.require('ol.geom.GeometryType');
goog.require('ol.style.Rule');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
@@ -24,7 +24,7 @@ ol.style.Style = function(options) {
/**
* @param {ol.Feature} feature Feature.
- * @return {Array.} Symbolizer literals for the
+ * @return {Array.} Symbolizer literals for the
* feature.
*/
ol.style.Style.prototype.apply = function(feature) {
@@ -46,7 +46,7 @@ ol.style.Style.prototype.apply = function(feature) {
/**
* @param {ol.Feature} feature Feature.
- * @return {Array.} Default symbolizer literals for
+ * @return {Array.} Default symbolizer literals for
* the feature.
*/
ol.style.Style.applyDefaultStyle = function(feature) {
diff --git a/src/ol/style/symbolizer.js b/src/ol/style/symbolizer.js
index b35ad81561..e8ae6fbe9b 100644
--- a/src/ol/style/symbolizer.js
+++ b/src/ol/style/symbolizer.js
@@ -1,5 +1,5 @@
goog.provide('ol.style.Symbolizer');
-goog.provide('ol.style.SymbolizerLiteral');
+goog.provide('ol.style.Literal');
goog.require('ol.Feature');
@@ -8,15 +8,15 @@ goog.require('ol.Feature');
/**
* @constructor
*/
-ol.style.SymbolizerLiteral = function() {};
+ol.style.Literal = function() {};
/**
- * @param {ol.style.SymbolizerLiteral} symbolizerLiteral Symbolizer literal to
+ * @param {ol.style.Literal} symbolizerLiteral Symbolizer literal to
* compare to.
* @return {boolean} Is the passed symbolizer literal equal to this instance?
*/
-ol.style.SymbolizerLiteral.prototype.equals = goog.abstractMethod;
+ol.style.Literal.prototype.equals = goog.abstractMethod;
@@ -28,6 +28,6 @@ ol.style.Symbolizer = function() {};
/**
* @param {ol.Feature=} opt_feature Feature for evaluating expressions.
- * @return {ol.style.SymbolizerLiteral} Literal symbolizer.
+ * @return {ol.style.Literal} Literal symbolizer.
*/
ol.style.Symbolizer.prototype.createLiteral = goog.abstractMethod;
diff --git a/src/ol/style/text.js b/src/ol/style/text.js
index e4fd413446..63c9951e76 100644
--- a/src/ol/style/text.js
+++ b/src/ol/style/text.js
@@ -6,7 +6,7 @@ goog.require('ol.expr');
goog.require('ol.expr.Expression');
goog.require('ol.expr.Literal');
goog.require('ol.style.Symbolizer');
-goog.require('ol.style.SymbolizerLiteral');
+goog.require('ol.style.Literal');
/**
@@ -22,7 +22,7 @@ ol.style.TextLiteralOptions;
/**
* @constructor
- * @extends {ol.style.SymbolizerLiteral}
+ * @extends {ol.style.Literal}
* @param {ol.style.TextLiteralOptions} options Text literal options.
*/
ol.style.TextLiteral = function(options) {
@@ -48,7 +48,7 @@ ol.style.TextLiteral = function(options) {
this.opacity = options.opacity;
};
-goog.inherits(ol.style.TextLiteral, ol.style.SymbolizerLiteral);
+goog.inherits(ol.style.TextLiteral, ol.style.Literal);
/**