diff --git a/build/library.cfg b/build/library.cfg
index 0120360165..0c1424deba 100644
--- a/build/library.cfg
+++ b/build/library.cfg
@@ -11,5 +11,5 @@ OpenLayers/Layer/KaMap.js
 OpenLayers/Layer/Google.js
 OpenLayers/Layer/Yahoo.js
 OpenLayers/Layer/VirtualEarth.js
-OpenLayers/Layer/UntiledWMS.js
+OpenLayers/Layer/WMS/Untiled.js
 OpenLayers/Control/KeyboardDefaults.js
diff --git a/examples/notile.html b/examples/notile.html
index 76b3750316..3a757bfd96 100644
--- a/examples/notile.html
+++ b/examples/notile.html
@@ -13,7 +13,7 @@
         function init(){
             var map = new OpenLayers.Map('map');
 
-            var ol_wms = new OpenLayers.Layer.UntiledWMS( "OpenLayers WMS", 
+            var ol_wms = new OpenLayers.Layer.WMS.Untiled( "OpenLayers WMS", 
                 "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
 
             map.addLayers([ol_wms]);
diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js
index 720c657368..b56d55edda 100644
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -65,11 +65,11 @@ if (typeof(_OPENLAYERS_SFL_) == "undefined") {
 //        "OpenLayers/Layer/Yahoo.js",
         "OpenLayers/Layer/Grid.js",
         "OpenLayers/Layer/KaMap.js",
-        "OpenLayers/Layer/UntiledWMS.js",
         "OpenLayers/Layer/Markers.js",
         "OpenLayers/Layer/Text.js",
         "OpenLayers/Layer/WMS.js",
         "OpenLayers/Layer/WFS.js",
+        "OpenLayers/Layer/WMS/Untiled.js",
         "OpenLayers/Popup/Anchored.js",
         "OpenLayers/Popup/AnchoredBubble.js",
         "OpenLayers/Control.js",
diff --git a/lib/OpenLayers/Layer/UntiledWMS.js b/lib/OpenLayers/Layer/WMS/Untiled.js
similarity index 95%
rename from lib/OpenLayers/Layer/UntiledWMS.js
rename to lib/OpenLayers/Layer/WMS/Untiled.js
index 5a5eebb676..4486c4f02a 100644
--- a/lib/OpenLayers/Layer/UntiledWMS.js
+++ b/lib/OpenLayers/Layer/WMS/Untiled.js
@@ -5,8 +5,8 @@
 /**
 * @class
 */
-OpenLayers.Layer.UntiledWMS = Class.create();
-OpenLayers.Layer.UntiledWMS.prototype = 
+OpenLayers.Layer.WMS.Untiled = Class.create();
+OpenLayers.Layer.WMS.Untiled.prototype = 
   Object.extend( new OpenLayers.Layer.Grid(), {
 
     /** @final @type hash */
@@ -93,5 +93,5 @@ OpenLayers.Layer.UntiledWMS.prototype =
         }
     },
     /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer.UntiledWMS"
+    CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
 });