diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js
index 9c8cb99721..e483fcfa52 100644
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -51,7 +51,7 @@ catch(e){
         "OpenLayers/Tile/WFS.js",
         "OpenLayers/Layer/Google.js",
         "OpenLayers/Layer/Grid.js",
-        "OpenLayers/Layer/Marker.js",
+        "OpenLayers/Layer/Markers.js",
         "OpenLayers/Layer/Text.js",
         "OpenLayers/Layer/WMS.js",
         "OpenLayers/Layer/WFS.js",
diff --git a/lib/OpenLayers/Layer/Marker.js b/lib/OpenLayers/Layer/Markers.js
similarity index 92%
rename from lib/OpenLayers/Layer/Marker.js
rename to lib/OpenLayers/Layer/Markers.js
index e3e2e0238a..d7936a07f0 100644
--- a/lib/OpenLayers/Layer/Marker.js
+++ b/lib/OpenLayers/Layer/Markers.js
@@ -2,8 +2,8 @@
 /**
 * @class
 */
-OpenLayers.Layer.Marker = Class.create();
-OpenLayers.Layer.Marker.prototype = 
+OpenLayers.Layer.Markers = Class.create();
+OpenLayers.Layer.Markers.prototype = 
   Object.extend( new OpenLayers.Layer(), {
     
     /** internal marker list
@@ -67,5 +67,5 @@ OpenLayers.Layer.Marker.prototype =
     },
     
     /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer.Marker"
+    CLASS_NAME: "OpenLayers.Layer.Markers"
 });
diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js
index 95e2e429c8..cc4c109f15 100644
--- a/lib/OpenLayers/Layer/Text.js
+++ b/lib/OpenLayers/Layer/Text.js
@@ -1,10 +1,10 @@
-// @require OpenLayers/Layer/Marker.js
+// @require OpenLayers/Layer/Markers.js
 /**
 * @class
 */
 OpenLayers.Layer.Text = Class.create();
 OpenLayers.Layer.Text.prototype = 
-  Object.extend( new OpenLayers.Layer.Marker(), {
+  Object.extend( new OpenLayers.Layer.Markers(), {
 
     /** store url of text file
     * @type str */
@@ -15,7 +15,7 @@ OpenLayers.Layer.Text.prototype =
     * @param {String} name
     */
     initialize: function(name, location) {
-        OpenLayers.Layer.Marker.prototype.initialize.apply(this, [name]);
+        OpenLayers.Layer.Markers.prototype.initialize.apply(this, [name]);
         this.location = location;
         new Ajax.Request(location, 
           { method: 'get', onComplete:this.parseData.bind(this) } );
diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js
index 08ded1f7ba..aaa0d286b4 100644
--- a/lib/OpenLayers/Layer/WFS.js
+++ b/lib/OpenLayers/Layer/WFS.js
@@ -1,12 +1,12 @@
 // @require OpenLayers/Layer/Grid.js
-// @require OpenLayers/Layer/Marker.js
+// @require OpenLayers/Layer/Markers.js
 /**
 * @class
 */
 OpenLayers.Layer.WFS = Class.create();
 OpenLayers.Layer.WFS.prototype = 
   Object.extend(new OpenLayers.Layer.Grid(),
-    Object.extend(new OpenLayers.Layer.Marker(), {
+    Object.extend(new OpenLayers.Layer.Markers(), {
 
     /** @final @type hash */
     DEFAULT_PARAMS: { service: "WFS",
@@ -24,7 +24,7 @@ OpenLayers.Layer.WFS.prototype =
     */
     initialize: function(name, url, params) {
         OpenLayers.Layer.Grid.prototype.initialize.apply(this, arguments);
-        OpenLayers.Layer.Marker.prototype.initialize.apply(this, arguments);
+        OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
         OpenLayers.Util.applyDefaults(this.params, this.DEFAULT_PARAMS);
     },    
     
@@ -34,7 +34,7 @@ OpenLayers.Layer.WFS.prototype =
     */
     moveTo: function(bounds, zoomChanged) {
         OpenLayers.Layer.Grid.prototype.moveTo.apply(this, arguments);
-        OpenLayers.Layer.Marker.prototype.moveTo.apply(this, arguments);
+        OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
     },
     
     /**