diff --git a/lib/OpenLayers/Control/ArgParser.js b/lib/OpenLayers/Control/ArgParser.js
index d1a90d40ec..a0261c7dd2 100644
--- a/lib/OpenLayers/Control/ArgParser.js
+++ b/lib/OpenLayers/Control/ArgParser.js
@@ -61,7 +61,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
         }
         if (i == this.map.controls.length) {
 
-            var args = OpenLayers.Util.getArgs();
+            var args = OpenLayers.Util.getParameters();
             if (args.lat && args.lon) {
                 this.center = new OpenLayers.LonLat(parseFloat(args.lon),
                                                     parseFloat(args.lat));
diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js
index 63393828fe..d82e96ef7e 100644
--- a/lib/OpenLayers/Layer/HTTPRequest.js
+++ b/lib/OpenLayers/Layer/HTTPRequest.js
@@ -181,7 +181,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
  
         // ignore parameters that are already in the url search string
         var urlParams = 
-            OpenLayers.Util.upperCaseObject(OpenLayers.Util.getArgs(url));
+            OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
         for(var key in allParams) {
             if(key.toUpperCase() in urlParams) {
                 delete allParams[key];
diff --git a/lib/OpenLayers/Layer/MapServer.js b/lib/OpenLayers/Layer/MapServer.js
index f27596a37d..a90e67969c 100644
--- a/lib/OpenLayers/Layer/MapServer.js
+++ b/lib/OpenLayers/Layer/MapServer.js
@@ -157,7 +157,7 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
         allParams = OpenLayers.Util.extend(allParams, newParams);
         // ignore parameters that are already in the url search string
         var urlParams = OpenLayers.Util.upperCaseObject(
-                            OpenLayers.Util.getArgs(url));
+                            OpenLayers.Util.getParameters(url));
         for(var key in allParams) {
             if(key.toUpperCase() in urlParams) {
                 delete allParams[key];
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index 179de144ba..da66596f16 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -1155,7 +1155,7 @@ OpenLayers.Util.createUrlObject = function(url, options) {
         var qMark = url.indexOf("?");
         queryString = (qMark != -1) ? url.substr(qMark) : "";
     }
-    urlObject.args = OpenLayers.Util.getArgs(queryString);
+    urlObject.args = OpenLayers.Util.getParameters(queryString);
 
 
   //pathname (this part allows for relative <-> absolute comparison)
diff --git a/tests/Layer/test_WMS.html b/tests/Layer/test_WMS.html
index 56dd100a2d..31f561758f 100644
--- a/tests/Layer/test_WMS.html
+++ b/tests/Layer/test_WMS.html
@@ -317,7 +317,7 @@
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
         var tile = layer.grid[0][0];
         var request = layer.getURL(tile.bounds);
-        var args = OpenLayers.Util.getArgs(request);
+        var args = OpenLayers.Util.getParameters(request);
         t.eq(parseInt(args['WIDTH']),
              tile.size.w,
              "layer without gutter requests images that are as wide as the tile");
@@ -338,7 +338,7 @@
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
         var tile = layer.grid[0][0];
         var request = layer.getURL(tile.bounds);
-        var args = OpenLayers.Util.getArgs(request);
+        var args = OpenLayers.Util.getParameters(request);
         t.eq(parseInt(args['WIDTH']),
              tile.size.w + (2 * gutter),
              "layer with gutter requests images that are wider by twice the gutter");
diff --git a/tests/test_Util.html b/tests/test_Util.html
index 8a693c2822..50c714af7c 100644
--- a/tests/test_Util.html
+++ b/tests/test_Util.html
@@ -569,16 +569,22 @@
 
     function test_Util_getParameters(t) {
         t.plan(6);
-        t.eq(OpenLayers.Util.getParameters('http://www.example.com'), {}, "getArgs works when args = ''");
-        t.eq(OpenLayers.Util.getParameters('http://www.example.com?'), {}, "getArgs works when args = '?'");
+        t.eq(OpenLayers.Util.getParameters('http://www.example.com'), {},
+             "getParameters works when args = ''");
+        t.eq(OpenLayers.Util.getParameters('http://www.example.com?'), {},
+             "getParameters works when args = '?'");
         t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=world&foo=bar'),
-                                     {'hello' : 'world', 'foo': 'bar'}, "getArgs works when args = '?hello=world&foo=bar'");
+             {'hello' : 'world', 'foo': 'bar'},
+             "getParameters works when args = '?hello=world&foo=bar'");
         t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=&foo=bar'),
-                                     {'hello' : '', 'foo': 'bar'}, "getArgs works when args = '?hello=&foo=bar'");
+             {'hello' : '', 'foo': 'bar'},
+             "getParameters works when args = '?hello=&foo=bar'");
         t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar#bugssucks'),
-                                     {'foo': 'bar'}, "getArgs works when using a fragment identifier");
+             {'foo': 'bar'},
+             "getParameters works when using a fragment identifier");
         t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'),
-                                     {'foo': ['bar', 'pub', 'disco']}, "getArgs works with a comma-separated value (parses into array)");
+             {'foo': ['bar', 'pub', 'disco']},
+             "getParameters works with a comma-separated value (parses into array)");
     }
 
     function test_Util_getArgs(t) {