diff --git a/src/ol/renderer/canvas/canvasrenderer.js b/src/ol/renderer/canvas/canvasrenderer.js
index 3ccb400144..83689f42db 100644
--- a/src/ol/renderer/canvas/canvasrenderer.js
+++ b/src/ol/renderer/canvas/canvasrenderer.js
@@ -8,12 +8,12 @@ goog.require('ol.Pixel');
 goog.require('ol.canvas');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
-goog.require('ol.style.LiteralLine');
-goog.require('ol.style.LiteralPoint');
-goog.require('ol.style.LiteralPolygon');
-goog.require('ol.style.LiteralShape');
-goog.require('ol.style.LiteralSymbolizer');
+goog.require('ol.style.LineLiteral');
+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');
 
 
 /**
@@ -72,25 +72,25 @@ ol.renderer.canvas.Renderer = function(canvas, transform, opt_offset) {
 /**
  * @param {ol.geom.GeometryType} type Geometry type.
  * @param {Array.<ol.Feature>} features Array of features.
- * @param {ol.style.LiteralSymbolizer} symbolizer Symbolizer.
+ * @param {ol.style.SymbolizerLiteral} symbolizer Symbolizer.
  */
 ol.renderer.canvas.Renderer.prototype.renderFeaturesByGeometryType =
     function(type, features, symbolizer) {
   switch (type) {
     case ol.geom.GeometryType.POINT:
-      goog.asserts.assert(symbolizer instanceof ol.style.LiteralPoint);
+      goog.asserts.assert(symbolizer instanceof ol.style.PointLiteral);
       this.renderPointFeatures_(
-          features, /** @type {ol.style.LiteralPoint} */ (symbolizer));
+          features, /** @type {ol.style.PointLiteral} */ (symbolizer));
       break;
     case ol.geom.GeometryType.LINESTRING:
-      goog.asserts.assert(symbolizer instanceof ol.style.LiteralLine);
+      goog.asserts.assert(symbolizer instanceof ol.style.LineLiteral);
       this.renderLineStringFeatures_(
-          features, /** @type {ol.style.LiteralLine} */ (symbolizer));
+          features, /** @type {ol.style.LineLiteral} */ (symbolizer));
       break;
     case ol.geom.GeometryType.POLYGON:
-      goog.asserts.assert(symbolizer instanceof ol.style.LiteralPolygon);
+      goog.asserts.assert(symbolizer instanceof ol.style.PolygonLiteral);
       this.renderPolygonFeatures_(
-          features, /** @type {ol.style.LiteralPolygon} */ (symbolizer));
+          features, /** @type {ol.style.PolygonLiteral} */ (symbolizer));
       break;
     default:
       throw new Error('Rendering not implemented for geometry type: ' + type);
@@ -100,7 +100,7 @@ ol.renderer.canvas.Renderer.prototype.renderFeaturesByGeometryType =
 
 /**
  * @param {Array.<ol.Feature>} features Array of line features.
- * @param {ol.style.LiteralLine} symbolizer Line symbolizer.
+ * @param {ol.style.LineLiteral} symbolizer Line symbolizer.
  * @private
  */
 ol.renderer.canvas.Renderer.prototype.renderLineStringFeatures_ =
@@ -135,7 +135,7 @@ ol.renderer.canvas.Renderer.prototype.renderLineStringFeatures_ =
 
 /**
  * @param {Array.<ol.Feature>} features Array of point features.
- * @param {ol.style.LiteralPoint} symbolizer Point symbolizer.
+ * @param {ol.style.PointLiteral} symbolizer Point symbolizer.
  * @private
  */
 ol.renderer.canvas.Renderer.prototype.renderPointFeatures_ =
@@ -144,7 +144,7 @@ ol.renderer.canvas.Renderer.prototype.renderPointFeatures_ =
   var context = this.context_,
       canvas, i, ii, coords, vec;
 
-  if (symbolizer instanceof ol.style.LiteralShape) {
+  if (symbolizer instanceof ol.style.ShapeLiteral) {
     canvas = ol.renderer.canvas.Renderer.renderShape(symbolizer);
   } else {
     throw new Error('Unsupported symbolizer: ' + symbolizer);
@@ -166,7 +166,7 @@ ol.renderer.canvas.Renderer.prototype.renderPointFeatures_ =
 
 /**
  * @param {Array.<ol.Feature>} features Array of polygon features.
- * @param {ol.style.LiteralPolygon} symbolizer Polygon symbolizer.
+ * @param {ol.style.PolygonLiteral} symbolizer Polygon symbolizer.
  * @private
  */
 ol.renderer.canvas.Renderer.prototype.renderPolygonFeatures_ =
@@ -237,7 +237,7 @@ ol.renderer.canvas.Renderer.prototype.renderPolygonFeatures_ =
 
 
 /**
- * @param {ol.style.LiteralShape} circle Shape symbolizer.
+ * @param {ol.style.ShapeLiteral} circle Shape symbolizer.
  * @return {!HTMLCanvasElement} Canvas element.
  * @private
  */
@@ -279,7 +279,7 @@ ol.renderer.canvas.Renderer.renderCircle_ = function(circle) {
 
 
 /**
- * @param {ol.style.LiteralShape} shape Shape symbolizer.
+ * @param {ol.style.ShapeLiteral} shape Shape symbolizer.
  * @return {!HTMLCanvasElement} Canvas element.
  */
 ol.renderer.canvas.Renderer.renderShape = function(shape) {
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index a170a5b769..5efe58ade3 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -14,9 +14,9 @@ goog.require('ol.geom.GeometryType');
 goog.require('ol.layer.Vector');
 goog.require('ol.renderer.canvas.Layer');
 goog.require('ol.renderer.canvas.Renderer');
-goog.require('ol.style.LiteralLine');
-goog.require('ol.style.LiteralPolygon');
-goog.require('ol.style.LiteralShape');
+goog.require('ol.style.LineLiteral');
+goog.require('ol.style.PolygonLiteral');
+goog.require('ol.style.ShapeLiteral');
 goog.require('ol.style.ShapeType');
 goog.require('ol.tilegrid.TileGrid');
 
@@ -118,7 +118,7 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) {
   // TODO: implement layer.setStyle(style) where style is a set of rules
   // and a rule has a filter and array of symbolizers
   var symbolizers = {};
-  symbolizers[ol.geom.GeometryType.POINT] = new ol.style.LiteralShape({
+  symbolizers[ol.geom.GeometryType.POINT] = new ol.style.ShapeLiteral({
     type: ol.style.ShapeType.CIRCLE,
     size: 10,
     fillStyle: '#ffcc99',
@@ -126,12 +126,12 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) {
     strokeWidth: 2,
     opacity: 0.75
   });
-  symbolizers[ol.geom.GeometryType.LINESTRING] = new ol.style.LiteralLine({
+  symbolizers[ol.geom.GeometryType.LINESTRING] = new ol.style.LineLiteral({
     strokeStyle: '#ff9933',
     strokeWidth: 2,
     opacity: 1
   });
-  symbolizers[ol.geom.GeometryType.POLYGON] = new ol.style.LiteralPolygon({
+  symbolizers[ol.geom.GeometryType.POLYGON] = new ol.style.PolygonLiteral({
     fillStyle: '#ffcc99',
     strokeStyle: '#ff9933',
     strokeWidth: 2,
diff --git a/src/ol/style/line.js b/src/ol/style/line.js
index 393affc669..32a5987ec4 100644
--- a/src/ol/style/line.js
+++ b/src/ol/style/line.js
@@ -1,10 +1,10 @@
 goog.provide('ol.style.Line');
-goog.provide('ol.style.LiteralLine');
+goog.provide('ol.style.LineLiteral');
 
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
-goog.require('ol.style.LiteralSymbolizer');
 goog.require('ol.style.Symbolizer');
+goog.require('ol.style.SymbolizerLiteral');
 
 
 /**
@@ -12,16 +12,16 @@ goog.require('ol.style.Symbolizer');
  *            strokeWidth: (number),
  *            opacity: (number)}}
  */
-ol.style.LiteralLineOptions;
+ol.style.LineLiteralOptions;
 
 
 
 /**
  * @constructor
- * @implements {ol.style.LiteralSymbolizer}
- * @param {ol.style.LiteralLineOptions} config Symbolizer properties.
+ * @implements {ol.style.SymbolizerLiteral}
+ * @param {ol.style.LineLiteralOptions} config Symbolizer properties.
  */
-ol.style.LiteralLine = function(config) {
+ol.style.LineLiteral = function(config) {
 
   /** @type {string} */
   this.strokeStyle = config.strokeStyle;
@@ -83,7 +83,7 @@ ol.style.Line = function(options) {
 
 /**
  * @inheritDoc
- * @return {ol.style.LiteralLine} Literal line symbolizer.
+ * @return {ol.style.LineLiteral} Literal line symbolizer.
  */
 ol.style.Line.prototype.createLiteral = function(feature) {
   var attrs = feature.getAttributes();
@@ -97,7 +97,7 @@ ol.style.Line.prototype.createLiteral = function(feature) {
   var opacity = this.opacity_.evaluate(feature, attrs);
   goog.asserts.assertNumber(opacity, 'opacity must be a number');
 
-  return new ol.style.LiteralLine({
+  return new ol.style.LineLiteral({
     strokeStyle: strokeStyle,
     strokeWidth: strokeWidth,
     opacity: opacity
@@ -106,9 +106,9 @@ ol.style.Line.prototype.createLiteral = function(feature) {
 
 
 /**
- * @type {ol.style.LiteralLine}
+ * @type {ol.style.LineLiteral}
  */
-ol.style.LineDefaults = new ol.style.LiteralLine({
+ol.style.LineDefaults = new ol.style.LineLiteral({
   strokeStyle: '#696969',
   strokeWidth: 1.5,
   opacity: 0.75
diff --git a/src/ol/style/point.js b/src/ol/style/point.js
index faec50af16..b153203d84 100644
--- a/src/ol/style/point.js
+++ b/src/ol/style/point.js
@@ -1,16 +1,16 @@
-goog.provide('ol.style.LiteralPoint');
 goog.provide('ol.style.Point');
+goog.provide('ol.style.PointLiteral');
 
-goog.require('ol.style.LiteralSymbolizer');
 goog.require('ol.style.Symbolizer');
+goog.require('ol.style.SymbolizerLiteral');
 
 
 
 /**
  * @constructor
- * @implements {ol.style.LiteralSymbolizer}
+ * @implements {ol.style.SymbolizerLiteral}
  */
-ol.style.LiteralPoint = function() {};
+ol.style.PointLiteral = function() {};
 
 
 
diff --git a/src/ol/style/polygon.js b/src/ol/style/polygon.js
index 3ada41fc67..e2b2d52ba2 100644
--- a/src/ol/style/polygon.js
+++ b/src/ol/style/polygon.js
@@ -1,10 +1,10 @@
-goog.provide('ol.style.LiteralPolygon');
 goog.provide('ol.style.Polygon');
+goog.provide('ol.style.PolygonLiteral');
 
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
-goog.require('ol.style.LiteralSymbolizer');
 goog.require('ol.style.Symbolizer');
+goog.require('ol.style.SymbolizerLiteral');
 
 
 /**
@@ -13,16 +13,16 @@ goog.require('ol.style.Symbolizer');
  *            strokeWidth: (number),
  *            opacity: (number)}}
  */
-ol.style.LiteralPolygonOptions;
+ol.style.PolygonLiteralOptions;
 
 
 
 /**
  * @constructor
- * @implements {ol.style.LiteralSymbolizer}
- * @param {ol.style.LiteralPolygonOptions} config Symbolizer properties.
+ * @implements {ol.style.SymbolizerLiteral}
+ * @param {ol.style.PolygonLiteralOptions} config Symbolizer properties.
  */
-ol.style.LiteralPolygon = function(config) {
+ol.style.PolygonLiteral = function(config) {
 
   /** @type {string} */
   this.fillStyle = config.fillStyle;
@@ -97,7 +97,7 @@ ol.style.Polygon = function(options) {
 
 /**
  * @inheritDoc
- * @return {ol.style.LiteralPolygon} Literal shape symbolizer.
+ * @return {ol.style.PolygonLiteral} Literal shape symbolizer.
  */
 ol.style.Polygon.prototype.createLiteral = function(feature) {
   var attrs = feature.getAttributes();
@@ -114,7 +114,7 @@ ol.style.Polygon.prototype.createLiteral = function(feature) {
   var opacity = this.opacity_.evaluate(feature, attrs);
   goog.asserts.assertNumber(opacity, 'opacity must be a number');
 
-  return new ol.style.LiteralPolygon({
+  return new ol.style.PolygonLiteral({
     fillStyle: fillStyle,
     strokeStyle: strokeStyle,
     strokeWidth: strokeWidth,
@@ -124,9 +124,9 @@ ol.style.Polygon.prototype.createLiteral = function(feature) {
 
 
 /**
- * @type {ol.style.LiteralPolygon}
+ * @type {ol.style.PolygonLiteral}
  */
-ol.style.PolygonDefaults = new ol.style.LiteralPolygon({
+ol.style.PolygonDefaults = new ol.style.PolygonLiteral({
   fillStyle: '#ffffff',
   strokeStyle: '#696969',
   strokeWidth: 1.5,
diff --git a/src/ol/style/shape.js b/src/ol/style/shape.js
index ce07f4bee9..e3007f5205 100644
--- a/src/ol/style/shape.js
+++ b/src/ol/style/shape.js
@@ -1,11 +1,11 @@
-goog.provide('ol.style.LiteralShape');
 goog.provide('ol.style.Shape');
+goog.provide('ol.style.ShapeLiteral');
 goog.provide('ol.style.ShapeType');
 
 goog.require('ol.Expression');
 goog.require('ol.ExpressionLiteral');
-goog.require('ol.style.LiteralPoint');
 goog.require('ol.style.Point');
+goog.require('ol.style.PointLiteral');
 
 
 /**
@@ -24,16 +24,16 @@ ol.style.ShapeType = {
  *            strokeWidth: (number),
  *            opacity: (number)}}
  */
-ol.style.LiteralShapeOptions;
+ol.style.ShapeLiteralOptions;
 
 
 
 /**
  * @constructor
- * @extends {ol.style.LiteralPoint}
- * @param {ol.style.LiteralShapeOptions} config Symbolizer properties.
+ * @extends {ol.style.PointLiteral}
+ * @param {ol.style.ShapeLiteralOptions} config Symbolizer properties.
  */
-ol.style.LiteralShape = function(config) {
+ol.style.ShapeLiteral = function(config) {
 
   /** @type {string} */
   this.type = config.type;
@@ -54,7 +54,7 @@ ol.style.LiteralShape = function(config) {
   this.opacity = config.opacity;
 
 };
-goog.inherits(ol.style.LiteralShape, ol.style.LiteralPoint);
+goog.inherits(ol.style.ShapeLiteral, ol.style.PointLiteral);
 
 
 /**
@@ -133,7 +133,7 @@ ol.style.Shape = function(options) {
 
 /**
  * @inheritDoc
- * @return {ol.style.LiteralShape} Literal shape symbolizer.
+ * @return {ol.style.ShapeLiteral} Literal shape symbolizer.
  */
 ol.style.Shape.prototype.createLiteral = function(feature) {
   var attrs = feature.getAttributes();
@@ -153,7 +153,7 @@ ol.style.Shape.prototype.createLiteral = function(feature) {
   var opacity = this.opacity_.evaluate(feature, attrs);
   goog.asserts.assertNumber(opacity, 'opacity must be a number');
 
-  return new ol.style.LiteralShape({
+  return new ol.style.ShapeLiteral({
     type: this.type_,
     size: size,
     fillStyle: fillStyle,
@@ -165,9 +165,9 @@ ol.style.Shape.prototype.createLiteral = function(feature) {
 
 
 /**
- * @type {ol.style.LiteralShape}
+ * @type {ol.style.ShapeLiteral}
  */
-ol.style.ShapeDefaults = new ol.style.LiteralShape({
+ol.style.ShapeDefaults = new ol.style.ShapeLiteral({
   type: ol.style.ShapeType.CIRCLE,
   size: 5,
   fillStyle: '#ffffff',
diff --git a/src/ol/style/symbolizer.js b/src/ol/style/symbolizer.js
index 432b0bbcac..f15cc79254 100644
--- a/src/ol/style/symbolizer.js
+++ b/src/ol/style/symbolizer.js
@@ -1,5 +1,5 @@
-goog.provide('ol.style.LiteralSymbolizer');
 goog.provide('ol.style.Symbolizer');
+goog.provide('ol.style.SymbolizerLiteral');
 
 goog.require('ol.Feature');
 
@@ -8,7 +8,7 @@ goog.require('ol.Feature');
 /**
  * @interface
  */
-ol.style.LiteralSymbolizer = function() {};
+ol.style.SymbolizerLiteral = function() {};
 
 
 
@@ -20,6 +20,6 @@ ol.style.Symbolizer = function() {};
 
 /**
  * @param {ol.Feature} feature Feature for evaluating expressions.
- * @return {ol.style.LiteralSymbolizer} Literal symbolizer.
+ * @return {ol.style.SymbolizerLiteral} Literal symbolizer.
  */
 ol.style.Symbolizer.prototype.createLiteral = function(feature) {};
diff --git a/test/spec/ol/style/line.test.js b/test/spec/ol/style/line.test.js
index c7ffdc177c..78fc4b1a16 100644
--- a/test/spec/ol/style/line.test.js
+++ b/test/spec/ol/style/line.test.js
@@ -36,7 +36,7 @@ describe('ol.style.Line', function() {
       });
 
       var literal = symbolizer.createLiteral(feature);
-      expect(literal).toBeA(ol.style.LiteralLine);
+      expect(literal).toBeA(ol.style.LineLiteral);
       expect(literal.opacity).toBe(42 / 100);
       expect(literal.strokeWidth).toBe(1.5);
     });
@@ -48,4 +48,4 @@ describe('ol.style.Line', function() {
 goog.require('ol.Expression');
 goog.require('ol.Feature');
 goog.require('ol.style.Line');
-goog.require('ol.style.LiteralLine');
+goog.require('ol.style.LineLiteral');
diff --git a/test/spec/ol/style/polygon.test.js b/test/spec/ol/style/polygon.test.js
index 52f639a324..436ba77cd4 100644
--- a/test/spec/ol/style/polygon.test.js
+++ b/test/spec/ol/style/polygon.test.js
@@ -36,7 +36,7 @@ describe('ol.style.Polygon', function() {
       });
 
       var literal = symbolizer.createLiteral(feature);
-      expect(literal).toBeA(ol.style.LiteralPolygon);
+      expect(literal).toBeA(ol.style.PolygonLiteral);
       expect(literal.opacity).toBe(42 / 100);
       expect(literal.fillStyle).toBe('#ff0000');
     });
@@ -48,4 +48,4 @@ describe('ol.style.Polygon', function() {
 goog.require('ol.Expression');
 goog.require('ol.Feature');
 goog.require('ol.style.Polygon');
-goog.require('ol.style.LiteralPolygon');
+goog.require('ol.style.PolygonLiteral');
diff --git a/test/spec/ol/style/shape.test.js b/test/spec/ol/style/shape.test.js
index 17835fb047..acf0996e90 100644
--- a/test/spec/ol/style/shape.test.js
+++ b/test/spec/ol/style/shape.test.js
@@ -36,7 +36,7 @@ describe('ol.style.Shape', function() {
       });
 
       var literal = symbolizer.createLiteral(feature);
-      expect(literal).toBeA(ol.style.LiteralShape);
+      expect(literal).toBeA(ol.style.ShapeLiteral);
       expect(literal.size).toBe(42);
       expect(literal.opacity).toBe(0.4);
     });
@@ -48,4 +48,4 @@ describe('ol.style.Shape', function() {
 goog.require('ol.Expression');
 goog.require('ol.Feature');
 goog.require('ol.style.Shape');
-goog.require('ol.style.LiteralShape');
+goog.require('ol.style.ShapeLiteral');