diff --git a/lib/chrome/context.js b/lib/chrome/context.js
index 611034f..618358d 100644
--- a/lib/chrome/context.js
+++ b/lib/chrome/context.js
@@ -10,7 +10,7 @@ const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { EventTarget } = require("sdk/event/target");
 const { Class } = require("sdk/core/heritage");
 const { defer } = require("sdk/core/promise");
-const { DomCache } = require("../dom/domCache.js");
+const { DomCache } = require("../dom/dom-cache.js");
 const { Obj } = require("../core/object.js");
 
 /**
diff --git a/lib/console/console-overlay.js b/lib/console/console-overlay.js
index d5683ea..5241cc8 100644
--- a/lib/console/console-overlay.js
+++ b/lib/console/console-overlay.js
@@ -15,8 +15,8 @@ const { getMostRecentBrowserWindow } = require("sdk/window/utils");
 const { Domplate } = require("../core/domplate.js");
 const { Dom } = require("../core/dom.js");
 const { VariablesView } = require("./variables-view.js");
-const { DomTree } = require("../dom/domTree.js");
-const { DomProvider } = require("../dom/domProvider.js");
+const { DomTree } = require("../dom/dom-tree.js");
+const { DomProvider } = require("../dom/dom-provider.js");
 const { BaseOverlay } = require("../chrome/base-overlay.js");
 const { Theme } = require("../chrome/theme.js");
 const { Menu } = require("../chrome/menu.js");
@@ -28,7 +28,7 @@ const { RemoteLoggingFilter } = require("./remote/logging-filter.js");
 const { CommandController } = require("./command-controller.js");
 
 // Side panels
-const { DomSidePanel } = require("../dom/domSidePanel.js");
+const { DomSidePanel } = require("../dom/dom-side-panel.js");
 const { CommandEditor } = require("./command-editor.js");
 
 // Get the Messages object which holds the main classes of Messages
diff --git a/lib/console/performance-timing.js b/lib/console/performance-timing.js
index e6ca47f..6ea4d64 100644
--- a/lib/console/performance-timing.js
+++ b/lib/console/performance-timing.js
@@ -14,7 +14,7 @@ const { Reps } = require("../reps/reps.js");
 const { Dom } = require("../core/dom.js");
 const { Locale } = require("../core/locale.js");
 const { Str } = require("../core/string.js");
-const { DomCache } = require("../dom/domCache.js");
+const { DomCache } = require("../dom/dom-cache.js");
 
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { Messages } = devtools["require"]("devtools/webconsole/console-output");
diff --git a/lib/console/variables-view.js b/lib/console/variables-view.js
index 62ed0f6..8858937 100644
--- a/lib/console/variables-view.js
+++ b/lib/console/variables-view.js
@@ -12,8 +12,8 @@ const { Cu, Ci } = require("chrome");
 const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { Class } = require("sdk/core/heritage");
 const { EventTarget } = require("sdk/event/target");
-const { DomTree } = require("../dom/domTree.js");
-const { DomProvider } = require("../dom/domProvider.js");
+const { DomTree } = require("../dom/dom-tree.js");
+const { DomProvider } = require("../dom/dom-provider.js");
 const { loadSheet } = require("sdk/stylesheet/utils");
 const { Reps } = require("../reps/reps.js");
 const { Events } = require("../core/events.js");
diff --git a/lib/dom/domCache.js b/lib/dom/dom-cache.js
similarity index 100%
rename from lib/dom/domCache.js
rename to lib/dom/dom-cache.js
diff --git a/lib/dom/domPanel.js b/lib/dom/dom-panel.js
similarity index 98%
rename from lib/dom/domPanel.js
rename to lib/dom/dom-panel.js
index cb2d7d6..a5afa6a 100644
--- a/lib/dom/domPanel.js
+++ b/lib/dom/dom-panel.js
@@ -15,12 +15,12 @@ const { Class } = require("sdk/core/heritage");
 const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { Tool } = require("dev/toolbox");
 const { Locale } = require("../core/locale.js");
-const { DomTree } = require("../dom/domTree.js");
-const { DomProvider } = require("../dom/domProvider.js");
+const { DomTree } = require("../dom/dom-tree.js");
+const { DomProvider } = require("../dom/dom-provider.js");
 const { loadSheet, removeSheet } = require("sdk/stylesheet/utils");
 const { defer } = require("sdk/core/promise");
 const { getFrameElement } = require("sdk/window/utils");
-const { TextSearch } = require("./textSearch.js");
+const { TextSearch } = require("./text-search.js");
 const { Dom } = require("../core/dom.js");
 const { Css } = require("../core/css.js");
 const { target } = require("../target.js");
diff --git a/lib/dom/domProvider.js b/lib/dom/dom-provider.js
similarity index 100%
rename from lib/dom/domProvider.js
rename to lib/dom/dom-provider.js
diff --git a/lib/dom/domSidePanel.js b/lib/dom/dom-side-panel.js
similarity index 95%
rename from lib/dom/domSidePanel.js
rename to lib/dom/dom-side-panel.js
index 0470273..29a56e1 100644
--- a/lib/dom/domSidePanel.js
+++ b/lib/dom/dom-side-panel.js
@@ -15,8 +15,8 @@ const { Class } = require("sdk/core/heritage");
 const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { Tool } = require("dev/toolbox");
 const { Locale } = require("../core/locale.js");
-const { DomTree } = require("../dom/domTree.js");
-const { DomProvider } = require("../dom/domProvider.js");
+const { DomTree } = require("../dom/dom-tree.js");
+const { DomProvider } = require("../dom/dom-provider.js");
 const { loadSheet } = require("sdk/stylesheet/utils");
 const { defer } = require("sdk/core/promise");
 
diff --git a/lib/dom/domTree.js b/lib/dom/dom-tree.js
similarity index 100%
rename from lib/dom/domTree.js
rename to lib/dom/dom-tree.js
diff --git a/lib/dom/textSearch.js b/lib/dom/text-search.js
similarity index 100%
rename from lib/dom/textSearch.js
rename to lib/dom/text-search.js
diff --git a/lib/firebug.js b/lib/firebug.js
index 957e103..dcb53c3 100644
--- a/lib/firebug.js
+++ b/lib/firebug.js
@@ -37,7 +37,7 @@ require("./chrome/window-watcher.js");
 require("./chrome/start-button.js");
 require("./chrome/page-context-menu.js");
 require("./inspector/inspector-button.js");
-require("./dom/domPanel.js");
+require("./dom/dom-panel.js");
 require("./console/remote/logging.js");
 require("./debug/telemetry.js");
 
diff --git a/lib/inspector/inspector-overlay.js b/lib/inspector/inspector-overlay.js
index 232ff4f..2307a0e 100644
--- a/lib/inspector/inspector-overlay.js
+++ b/lib/inspector/inspector-overlay.js
@@ -10,12 +10,12 @@ const { loadSheet, removeSheet } = require("sdk/stylesheet/utils");
 const { EventTarget } = require("sdk/event/target");
 const { Class } = require("sdk/core/heritage");
 const { Locale } = require("../core/locale.js");
-const { DomTree } = require("../dom/domTree.js");
-const { DomProvider } = require("../dom/domProvider.js");
+const { DomTree } = require("../dom/dom-tree.js");
+const { DomProvider } = require("../dom/dom-provider.js");
 const { BaseOverlay } = require("../chrome/base-overlay.js");
 const { Theme } = require("../chrome/theme.js");
 const { Win } = require("../core/window.js");
-const { DomSidePanel } = require("../dom/domSidePanel.js");
+const { DomSidePanel } = require("../dom/dom-side-panel.js");
 const { ToggleSideBarButton } = require("../chrome/toggle-sidebar-button.js");
 const { RuleViewOverlay } = require("./rule-view-overlay.js");
 const { ComputedViewOverlay } = require("./computed-view-overlay.js");
diff --git a/test/test-dom-panel.js b/test/test-dom-panel.js
index c9e4f9b..a8ccda3 100644
--- a/test/test-dom-panel.js
+++ b/test/test-dom-panel.js
@@ -5,7 +5,7 @@
 const { getToolDefinition, getToolboxWhenReady } = require("./toolbox.js");
 const { closeTab } = require("./window.js");
 const { setTimeout } = require("sdk/timers");
-const { domPanelId } = require("../lib/dom/domPanel");
+const { domPanelId } = require("../lib/dom/dom-panel.js");
 
 /**
  * This test checks existence of the DOM panel. It opens a new tab,