diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 709b2cf17f..bfacd10c5e 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -276,7 +276,7 @@ OpenLayers.Control.LayerSwitcher =
     
                 // create input element
                 var inputElem = document.createElement("input");
-                inputElem.id = "input_" + layer.name;
+                inputElem.id = this.id + "_input_" + layer.name;
                 inputElem.name = (baseLayer) ? "baseLayers" : layer.name;
                 inputElem.type = (baseLayer) ? "radio" : "checkbox";
                 inputElem.value = layer.name;
@@ -490,7 +490,7 @@ OpenLayers.Control.LayerSwitcher =
 
         // layers list div        
         this.layersDiv = document.createElement("div");
-        this.layersDiv.id = "layersDiv";
+        this.layersDiv.id = this.id + "_layersDiv";
         this.layersDiv.style.paddingTop = "5px";
         this.layersDiv.style.paddingLeft = "10px";
         this.layersDiv.style.paddingBottom = "5px";
diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index 086afd16d0..530b11966f 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -111,7 +111,7 @@ OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, {
     _addButton:function(id, img, xy, sz) {
         var imgLocation = OpenLayers.Util.getImagesLocation() + img;
         var btn = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_PanZoom_" + id, 
+                                    this.id + "_" + id, 
                                     xy, sz, imgLocation, "absolute");
 
         //we want to add the outer div
diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js
index 7047e0682c..ebce5ad6ac 100644
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -156,7 +156,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
     _addZoomBar:function(centered) {
         var imgLocation = OpenLayers.Util.getImagesLocation();
         
-        var id = "OpenLayers_Control_PanZoomBar_Slider" + this.map.id;
+        var id = this.id + "_" + this.map.id;
         var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom();
         var slider = OpenLayers.Util.createAlphaImageDiv(id,
                        centered.add(-1, zoomsToEnd * this.zoomStopHeight), 
@@ -181,7 +181,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
         var div = null;
         
         if (OpenLayers.Util.alphaHack()) {
-            var id = "OpenLayers_Control_PanZoomBar" + this.map.id;
+            var id = this.id + "_" + this.map.id;
             div = OpenLayers.Util.createAlphaImageDiv(id, centered,
                                       new OpenLayers.Size(sz.w, 
                                               this.zoomStopHeight),
diff --git a/tests/Control/LayerSwitcher.html b/tests/Control/LayerSwitcher.html
index 08bae4fdb4..630254be22 100644
--- a/tests/Control/LayerSwitcher.html
+++ b/tests/Control/LayerSwitcher.html
@@ -79,14 +79,13 @@
         control = new OpenLayers.Control.LayerSwitcher();
         map.addControl(control);
 
-        
-        var wmsInput = OpenLayers.Util.getElement("input_" + layer.name);
+        var wmsInput = OpenLayers.Util.getElement(control.id + "_input_" + layer.name);
         t.ok(wmsInput != null, "correctly makes an input for wms layer");
         t.eq(wmsInput.type, "radio", "wms correctly made a radio button");
         t.eq(wmsInput.name, "baseLayers", "wms correctly named");
         t.eq(wmsInput.value, layer.name, "wms correctly valued");
         
-        var markersInput = OpenLayers.Util.getElement("input_" + markers.name);
+        var markersInput = OpenLayers.Util.getElement(control.id + "_input_" + markers.name);
         t.ok(markersInput != null, "correctly makes an input for markers layer");
         t.eq(markersInput.type, "checkbox", "wms correctly made a radio button");
         t.eq(markersInput.name, markers.name, "wms correctly named");