diff --git a/mozilla/browser/components/places/content/bookmarkProperties.js b/mozilla/browser/components/places/content/bookmarkProperties.js
index a9d292566f5..3eae54334ac 100755
--- a/mozilla/browser/components/places/content/bookmarkProperties.js
+++ b/mozilla/browser/components/places/content/bookmarkProperties.js
@@ -303,7 +303,7 @@ var BookmarkPropertiesPanel = {
    */
 
   _initFolderTree: function BPP__initFolderTree() {
-    this._folderTree = this._dialogWindow.document.getElementById("folder-tree");
+    this._folderTree = this._dialogWindow.document.getElementById("folderTree");
     this._folderTree.peerDropTypes = [];
     this._folderTree.childDropTypes = [];
     this._folderTree.excludeItems = true;
@@ -340,9 +340,9 @@ var BookmarkPropertiesPanel = {
         "true";
     }
 
-    var nurl = document.getElementById("edit-urlbar");
+    var nurl = document.getElementById("editURLBar");
 
-    var titlebox = document.getElementById("edit-titlebox");
+    var titlebox = document.getElementById("editTitleBox");
 
     titlebox.value = this._bookmarkTitle;
 
@@ -362,12 +362,12 @@ var BookmarkPropertiesPanel = {
 
     if (this._isShortcutVisible()) {
       var shortcutbox =
-        this._dialogWindow.document.getElementById("edit-shortcutbox");
+        this._dialogWindow.document.getElementById("editShortcutBox");
       shortcutbox.value = this._bms.getKeywordForURI(this._bookmarkURI);
     }
     else {
       var shortcutRow =
-        this._dialogWindow.document.getElementById("shortcut-row");
+        this._dialogWindow.document.getElementById("shortcutRow");
       shortcutRow.setAttribute("hidden", "true");
     }
 
@@ -376,7 +376,7 @@ var BookmarkPropertiesPanel = {
     }
     else {
       var folderRow =
-        this._dialogWindow.document.getElementById("folder-row");
+        this._dialogWindow.document.getElementById("folderRow");
       folderRow.setAttribute("hidden", "true");
     }
   },
@@ -441,7 +441,7 @@ var BookmarkPropertiesPanel = {
    * was open.
    */
   _saveChanges: function PBD_saveChanges() {
-    var urlbox = this._dialogWindow.document.getElementById("edit-urlbar");
+    var urlbox = this._dialogWindow.document.getElementById("editURLBar");
     var newURI = this._bookmarkURI;
     if (this._identifierIsURI() && this._isURIEditable())
       newURI = this._uri(urlbox.value);
@@ -461,7 +461,7 @@ var BookmarkPropertiesPanel = {
     }
 
 
-    var titlebox = this._dialogWindow.document.getElementById("edit-titlebox");
+    var titlebox = this._dialogWindow.document.getElementById("editTitleBox");
     if (this._identifierIsURI())
       this._bms.setItemTitle(this._bookmarkURI, titlebox.value);
     else
@@ -469,7 +469,7 @@ var BookmarkPropertiesPanel = {
 
     if (this._isShortcutVisible()) {
       var shortcutbox =
-        this._dialogWindow.document.getElementById("edit-shortcutbox");
+        this._dialogWindow.document.getElementById("editShortcutBox");
       this._bms.setKeywordForURI(this._bookmarkURI, shortcutbox.value);
     }
 
diff --git a/mozilla/browser/components/places/content/bookmarkProperties.xul b/mozilla/browser/components/places/content/bookmarkProperties.xul
index 7f9b41788f6..d9695467395 100755
--- a/mozilla/browser/components/places/content/bookmarkProperties.xul
+++ b/mozilla/browser/components/places/content/bookmarkProperties.xul
@@ -29,20 +29,20 @@
   <script type="application/x-javascript"
           src="chrome://browser/content/places/bookmarkProperties.js"/>
 
-      <vbox id="places-info-options" flex="1">
-        <grid id="places-info-grid" flex="1">
+      <vbox id="placesInfoOptions" flex="1">
+        <grid id="placesInfoGrid" flex="1">
           <columns>
             <column flex="1" align="end" />
             <column flex="100" align="start" />
           </columns>
-          <rows>
-            <row>
+          <rows id="placesInfoRows">
+            <row id="titleRow">
               <vbox align="end">
                 <hbox align="center" flex="1">
                   <label value="&bookmark.property.title;" align="middle"/>
                 </hbox>
               </vbox>
-              <textbox id="edit-titlebox" value=""/>
+              <textbox id="editTitleBox" value=""/>
             </row>
             <row id="locationRow">
               <vbox align="end">
@@ -50,24 +50,24 @@
                   <label value="&bookmark.property.location;" align="middle"/>
                 </hbox>
               </vbox>
-              <textbox id="edit-urlbar" size="10"/>
+              <textbox id="editURLBar" size="10"/>
             </row>
-            <row id="shortcut-row">
+            <row id="shortcutRow">
               <vbox align="end">
                 <hbox align="center" flex="1">
                   <label value="&bookmark.property.shortcut;" align="middle"/>
                 </hbox>
               </vbox>
-              <textbox id="edit-shortcutbox" value=""/>
+              <textbox id="editShortcutBox" value=""/>
             </row>
-            <row id="folder-row" flex="1" style="min-height: 100px;">
+            <row id="folderRow" flex="1" style="min-height: 100px;">
               <vbox align="end">
                 <hbox align="start" flex="1">
                   <label value="&bookmark.property.parents;"/>
                 </hbox>
               </vbox>
               <vbox>
-                <tree id="folder-tree"
+                <tree id="folderTree"
                       class="placesTree"
                       flex="1"
                       type="places" 
diff --git a/mozilla/browser/themes/pinstripe/browser/places/bookmarkProperties.css b/mozilla/browser/themes/pinstripe/browser/places/bookmarkProperties.css
index d0de817ea7a..b45389caa17 100755
--- a/mozilla/browser/themes/pinstripe/browser/places/bookmarkProperties.css
+++ b/mozilla/browser/themes/pinstripe/browser/places/bookmarkProperties.css
@@ -1,3 +1,3 @@
-#folder-tree {
+#folderTree {
   margin: 4px;
 }
diff --git a/mozilla/browser/themes/winstripe/browser/places/bookmarkProperties.css b/mozilla/browser/themes/winstripe/browser/places/bookmarkProperties.css
index d0de817ea7a..b45389caa17 100755
--- a/mozilla/browser/themes/winstripe/browser/places/bookmarkProperties.css
+++ b/mozilla/browser/themes/winstripe/browser/places/bookmarkProperties.css
@@ -1,3 +1,3 @@
-#folder-tree {
+#folderTree {
   margin: 4px;
 }