diff --git a/examples/click.html b/examples/click.html
index 6389d54a7e..4ae607f93e 100644
--- a/examples/click.html
+++ b/examples/click.html
@@ -26,7 +26,7 @@
             map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.setCenter(new OpenLayers.LonLat(0, 0), 0);
             map.events.register("click", map, function(e) { 
-                var lonlat = map.getLonLatFromScreenPx(e.xy);
+                var lonlat = map.getLonLatFromViewPortPx(e.xy);
                 alert("You clicked near " + lonlat.lat + " N, " +
                                           + lonlat.lon + " E");
             });
diff --git a/examples/markerss.html b/examples/markerss.html
index 57f47a3083..3bb4a18edb 100644
--- a/examples/markerss.html
+++ b/examples/markerss.html
@@ -41,8 +41,8 @@
         function changer() {
             var lon = map.getLonLatFromLayerPx(new OpenLayers.Pixel(0,0)).lon;
             var lat = map.getLonLatFromLayerPx(new OpenLayers.Pixel(0,0)).lat;
-            var slon = map.getLonLatFromScreenPx(new OpenLayers.Pixel(0,0)).lon;
-            var slat = map.getLonLatFromScreenPx(new OpenLayers.Pixel(0,0)).lat;
+            var slon = map.getLonLatFromViewPortPx(new OpenLayers.Pixel(0,0)).lon;
+            var slat = map.getLonLatFromViewPortPx(new OpenLayers.Pixel(0,0)).lat;
             alert("lon=" + lon + " lat=" + lat 
                   + "slon=" + slon + " slat=" + slat);
         }
diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js
index c0d4378d44..e5c29085f6 100644
--- a/lib/OpenLayers/Control/MouseDefaults.js
+++ b/lib/OpenLayers/Control/MouseDefaults.js
@@ -28,7 +28,7 @@ OpenLayers.Control.MouseDefaults.prototype =
     * @param {Event} evt
     */
     defaultDblClick: function (evt) {
-        var newCenter = this.map.getLonLatFromScreenPx( evt.xy ); 
+        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
         this.map.setCenter(newCenter, this.map.zoom + 1);
     },
 
@@ -77,7 +77,7 @@ OpenLayers.Control.MouseDefaults.prototype =
                 var size = this.map.getSize();
                 var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
                                                  size.h / 2 + deltaY);
-                var newCenter = this.map.getLonLatFromScreenPx( newXY ); 
+                var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
                 this.map.setCenter(newCenter, null, true);
                 this.mouseDragStart = evt.xy.copyOf();
                 this.map.div.style.cursor = "move";
@@ -91,8 +91,8 @@ OpenLayers.Control.MouseDefaults.prototype =
     */
     defaultMouseUp: function (evt) {
         if (this.zoomBox) {
-            var start = this.map.getLonLatFromScreenPx( this.mouseDragStart ); 
-            var end = this.map.getLonLatFromScreenPx( evt.xy );
+            var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
+            var end = this.map.getLonLatFromViewPortPx( evt.xy );
             var top = Math.max(start.lat, end.lat);
             var bottom = Math.min(start.lat, end.lat);
             var left = Math.min(start.lon, end.lon);
diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index efda28be2f..54411c5830 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -85,7 +85,7 @@ OpenLayers.Control.MouseToolbar.prototype =
     */
     defaultDblClick: function (evt) {
         this.switchModeTo("pan");
-        var newCenter = this.map.getLonLatFromScreenPx( evt.xy ); 
+        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
         this.map.setCenter(newCenter, this.map.zoom + 2);
     },
 
@@ -120,13 +120,13 @@ OpenLayers.Control.MouseToolbar.prototype =
             case "measure":
                 var distance = "";
                 if (this.measureStart) {
-                    measureEnd = this.map.getLonLatFromScreenPx(this.mouseDragStart);
+                    measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
                     distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
                     distance = Math.round(distance * 100) / 100;
                     distance = distance + "km";
                     this.measureStartBox = this.measureBox;
                 }    
-                this.measureStart = this.map.getLonLatFromScreenPx(this.mouseDragStart);;
+                this.measureStart = this.map.getLonLatFromViewPortPx(this.mouseDragStart);;
                 this.measureBox = OpenLayers.Util.createDiv(null,
                                                          this.mouseDragStart.add(
                                                            -2-parseInt(this.map.layerContainerDiv.style.left),
@@ -211,7 +211,7 @@ OpenLayers.Control.MouseToolbar.prototype =
                     var size = this.map.getSize();
                     var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
                                                      size.h / 2 + deltaY);
-                    var newCenter = this.map.getLonLatFromScreenPx( newXY ); 
+                    var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
                     this.map.setCenter(newCenter, null, true);
                     this.mouseDragStart = evt.xy.copyOf();
             }
@@ -224,8 +224,8 @@ OpenLayers.Control.MouseToolbar.prototype =
     defaultMouseUp: function (evt) {
         switch (this.mode) {
             case "zoombox":
-                var start = this.map.getLonLatFromScreenPx( this.mouseDragStart ); 
-                var end = this.map.getLonLatFromScreenPx( evt.xy );
+                var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
+                var end = this.map.getLonLatFromViewPortPx( evt.xy );
                 var top = Math.max(start.lat, end.lat);
                 var bottom = Math.min(start.lat, end.lat);
                 var left = Math.min(start.lon, end.lon);
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 0206dbf0dc..b4c71ba323 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -352,7 +352,7 @@ OpenLayers.Map.prototype = {
     getLonLatFromLayerPx: function (px) {
        //adjust for displacement of layerContainerDiv
        px = this.getScreenPxFromLayerPx(px);
-       return this.getLonLatFromScreenPx(px);         
+       return this.getLonLatFromViewPortPx(px);         
     },
     
     /**
@@ -363,7 +363,7 @@ OpenLayers.Map.prototype = {
     *          current extent and resolution
     * @type OpenLayers.LonLat
     */
-    getLonLatFromScreenPx: function (screenPx) {
+    getLonLatFromViewPortPx: function (screenPx) {
         var center = this.getCenter();        //map center lon/lat
         var res  = this.getResolution();
         var size = this.getSize();
diff --git a/tests/test_Map.html b/tests/test_Map.html
index 3b6feb5582..86288a8efe 100644
--- a/tests/test_Map.html
+++ b/tests/test_Map.html
@@ -125,8 +125,8 @@
         map.setCenter(new OpenLayers.LonLat(0, 0), 0);
  
         var pixel = new OpenLayers.Pixel(50,150);
-        var lonlat = map.getLonLatFromScreenPx(pixel);
-        t.ok( lonlat instanceof OpenLayers.LonLat, "getLonLatFromScreenPx returns valid OpenLayers.LonLat" );
+        var lonlat = map.getLonLatFromViewPortPx(pixel);
+        t.ok( lonlat instanceof OpenLayers.LonLat, "getLonLatFromViewPortPx returns valid OpenLayers.LonLat" );
 
         var newPixel = map.getScreenPxFromLonLat(lonlat);
         t.ok( newPixel instanceof OpenLayers.Pixel, "getScreenPxFromLonLat returns valid OpenLayers.Pixel" );