72 files changed, 138 insertions, 120 deletions
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
index 3bb2839..b9d9984 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
@@ -7,7 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/api/experimental.bluetooth.h"
+#include "chrome/common/extensions/api/experimental_bluetooth.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/extensions/api/dns/dns_api.cc b/chrome/browser/extensions/api/dns/dns_api.cc
index 2c5e51a..19ce671 100644
--- a/chrome/browser/extensions/api/dns/dns_api.cc
+++ b/chrome/browser/extensions/api/dns/dns_api.cc
@@ -8,7 +8,7 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/common/extensions/api/experimental.dns.h"
+#include "chrome/common/extensions/api/experimental_dns.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/browser/extensions/api/socket/socket_api.h b/chrome/browser/extensions/api/socket/socket_api.h
index 0fdfd38..6815dab 100644
--- a/chrome/browser/extensions/api/socket/socket_api.h
+++ b/chrome/browser/extensions/api/socket/socket_api.h
@@ -8,7 +8,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/api_function.h"
-#include "chrome/common/extensions/api/experimental.socket.h"
+#include "chrome/common/extensions/api/experimental_socket.h"
 #include "net/base/io_buffer.h"
 
 #include <string>
diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc
index df6d9ee..384649f 100644
--- a/chrome/browser/extensions/api/usb/usb_api.cc
+++ b/chrome/browser/extensions/api/usb/usb_api.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/usb/usb_service_factory.h"
 #include "chrome/browser/usb/usb_service.h"
-#include "chrome/common/extensions/api/experimental.usb.h"
+#include "chrome/common/extensions/api/experimental_usb.h"
 
 namespace BulkTransfer = extensions::api::experimental_usb::BulkTransfer;
 namespace CloseDevice = extensions::api::experimental_usb::CloseDevice;
diff --git a/chrome/browser/extensions/api/usb/usb_api.h b/chrome/browser/extensions/api/usb/usb_api.h
index 402eb9b..ed69b97 100644
--- a/chrome/browser/extensions/api/usb/usb_api.h
+++ b/chrome/browser/extensions/api/usb/usb_api.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "chrome/browser/extensions/api/api_function.h"
-#include "chrome/common/extensions/api/experimental.usb.h"
+#include "chrome/common/extensions/api/experimental_usb.h"
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/api/usb/usb_device_resource.cc b/chrome/browser/extensions/api/usb/usb_device_resource.cc
index a659d4fb..ab03a3e 100644
--- a/chrome/browser/extensions/api/usb/usb_device_resource.cc
+++ b/chrome/browser/extensions/api/usb/usb_device_resource.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/extensions/api/api_resource_event_notifier.h"
 #include "chrome/browser/extensions/api/api_resource.h"
 #include "chrome/browser/usb/usb_device.h"
-#include "chrome/common/extensions/api/experimental.usb.h"
+#include "chrome/common/extensions/api/experimental_usb.h"
 
 using extensions::api::experimental_usb::ControlTransferInfo;
 using extensions::api::experimental_usb::GenericTransferInfo;
diff --git a/chrome/browser/extensions/api/usb/usb_device_resource.h b/chrome/browser/extensions/api/usb/usb_device_resource.h
index 03c3793..427df27 100644
--- a/chrome/browser/extensions/api/usb/usb_device_resource.h
+++ b/chrome/browser/extensions/api/usb/usb_device_resource.h
@@ -12,7 +12,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/extensions/api/api_resource.h"
-#include "chrome/common/extensions/api/experimental.usb.h"
+#include "chrome/common/extensions/api/experimental_usb.h"
 
 class UsbDevice;
 
diff --git a/chrome/browser/extensions/extension_record_api.cc b/chrome/browser/extensions/extension_record_api.cc
index 9040ee9..035c798 100644
--- a/chrome/browser/extensions/extension_record_api.cc
+++ b/chrome/browser/extensions/extension_record_api.cc
@@ -16,7 +16,7 @@
 #include "base/utf_string_conversions.h"
 
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/api/experimental.record.h"
+#include "chrome/common/extensions/api/experimental_record.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 
diff --git a/chrome/browser/extensions/extension_record_api_test.cc b/chrome/browser/extensions/extension_record_api_test.cc
index 6ba23a8..9c5e786 100644
--- a/chrome/browser/extensions/extension_record_api_test.cc
+++ b/chrome/browser/extensions/extension_record_api_test.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/api/experimental.record.h"
+#include "chrome/common/extensions/api/experimental_record.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 76c69bb..ccb6970 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -18,10 +18,10 @@
       'variables': {
         'chromium_code': 1,
         'json_schema_files': [
-          'browserAction.json',
+          'browser_action.json',
           'declarative.json',
-          'experimental.record.json',
-          'experimental.fontSettings.json',
+          'experimental_font_settings.json',
+          'experimental_record.json',
           'permissions.json',
           'storage.json',
           'tabs.json',
@@ -29,12 +29,12 @@
         ],
         'idl_schema_files': [
           'alarms.idl',
-          'experimental.bluetooth.idl',
-          'experimental.dns.idl',
-          'experimental.idltest.idl',
-          'experimental.serial.idl',
-          'experimental.socket.idl',
-          'experimental.usb.idl',
+          'experimental_bluetooth.idl',
+          'experimental_dns.idl',
+          'experimental_idltest.idl',
+          'experimental_serial.idl',
+          'experimental_socket.idl',
+          'experimental_usb.idl',
         ],
         'cc_dir': 'chrome/common/extensions/api',
         'root_namespace': 'extensions::api',
@@ -42,7 +42,7 @@
       'conditions': [
         ['OS=="android"', {
           'idl_schema_files!': [
-            'experimental.usb.idl',
+            'experimental_usb.idl',
           ],
         }],
       ],
diff --git a/chrome/common/extensions/api/browserAction.json b/chrome/common/extensions/api/browser_action.json
index b21cc99..b21cc99 100644
--- a/chrome/common/extensions/api/browserAction.json
+++ b/chrome/common/extensions/api/browser_action.json
diff --git a/chrome/common/extensions/api/browsingData.json b/chrome/common/extensions/api/browsing_data.json
index 7ba52cc..7ba52cc 100644
--- a/chrome/common/extensions/api/browsingData.json
+++ b/chrome/common/extensions/api/browsing_data.json
diff --git a/chrome/common/extensions/api/chromeAuthPrivate.json b/chrome/common/extensions/api/chrome_auth_private.json
index 9f29fe7..9f29fe7 100644
--- a/chrome/common/extensions/api/chromeAuthPrivate.json
+++ b/chrome/common/extensions/api/chrome_auth_private.json
diff --git a/chrome/common/extensions/api/chromeosInfoPrivate.json b/chrome/common/extensions/api/chromeos_info_private.json
index e2cd008..e2cd008 100644
--- a/chrome/common/extensions/api/chromeosInfoPrivate.json
+++ b/chrome/common/extensions/api/chromeos_info_private.json
diff --git a/chrome/common/extensions/api/contentSettings.json b/chrome/common/extensions/api/content_settings.json
index 2d6e803..2d6e803 100644
--- a/chrome/common/extensions/api/contentSettings.json
+++ b/chrome/common/extensions/api/content_settings.json
diff --git a/chrome/common/extensions/api/contextMenus.json b/chrome/common/extensions/api/context_menus.json
index 17c6f27..17c6f27 100644
--- a/chrome/common/extensions/api/contextMenus.json
+++ b/chrome/common/extensions/api/context_menus.json
diff --git a/chrome/common/extensions/api/declarativeWebRequest.json b/chrome/common/extensions/api/declarative_web_request.json
index c3d19dd..c3d19dd 100644
--- a/chrome/common/extensions/api/declarativeWebRequest.json
+++ b/chrome/common/extensions/api/declarative_web_request.json
diff --git a/chrome/common/extensions/api/echoPrivate.json b/chrome/common/extensions/api/echo_private.json
index 905c1fa..905c1fa 100644
--- a/chrome/common/extensions/api/echoPrivate.json
+++ b/chrome/common/extensions/api/echo_private.json
diff --git a/chrome/common/extensions/api/experimental.accessibility.json b/chrome/common/extensions/api/experimental_accessibility.json
index 901e6bc..901e6bc 100644
--- a/chrome/common/extensions/api/experimental.accessibility.json
+++ b/chrome/common/extensions/api/experimental_accessibility.json
diff --git a/chrome/common/extensions/api/experimental.app.json b/chrome/common/extensions/api/experimental_app.json
index a169fe5..a169fe5 100644
--- a/chrome/common/extensions/api/experimental.app.json
+++ b/chrome/common/extensions/api/experimental_app.json
diff --git a/chrome/common/extensions/api/experimental.bluetooth.idl b/chrome/common/extensions/api/experimental_bluetooth.idl
index 5be7c0f..5be7c0f 100644
--- a/chrome/common/extensions/api/experimental.bluetooth.idl
+++ b/chrome/common/extensions/api/experimental_bluetooth.idl
diff --git a/chrome/common/extensions/api/experimental.bookmarkManager.json b/chrome/common/extensions/api/experimental_bookmark_manager.json
index 4ad1415..4ad1415 100644
--- a/chrome/common/extensions/api/experimental.bookmarkManager.json
+++ b/chrome/common/extensions/api/experimental_bookmark_manager.json
diff --git a/chrome/common/extensions/api/experimental.dns.idl b/chrome/common/extensions/api/experimental_dns.idl
index 7fab5ad..7fab5ad 100644
--- a/chrome/common/extensions/api/experimental.dns.idl
+++ b/chrome/common/extensions/api/experimental_dns.idl
diff --git a/chrome/common/extensions/api/experimental.downloads.json b/chrome/common/extensions/api/experimental_downloads.json
index 3aeecb2..3aeecb2 100644
--- a/chrome/common/extensions/api/experimental.downloads.json
+++ b/chrome/common/extensions/api/experimental_downloads.json
diff --git a/chrome/common/extensions/api/experimental.fontSettings.json b/chrome/common/extensions/api/experimental_font_settings.json
index de7e6c5..de7e6c5 100644
--- a/chrome/common/extensions/api/experimental.fontSettings.json
+++ b/chrome/common/extensions/api/experimental_font_settings.json
diff --git a/chrome/common/extensions/api/experimental.identity.json b/chrome/common/extensions/api/experimental_identity.json
index 8aadbf2..8aadbf2 100644
--- a/chrome/common/extensions/api/experimental.identity.json
+++ b/chrome/common/extensions/api/experimental_identity.json
diff --git a/chrome/common/extensions/api/experimental.idltest.idl b/chrome/common/extensions/api/experimental_idltest.idl
index bfecbd3..bfecbd3 100644
--- a/chrome/common/extensions/api/experimental.idltest.idl
+++ b/chrome/common/extensions/api/experimental_idltest.idl
diff --git a/chrome/common/extensions/api/experimental.infobars.json b/chrome/common/extensions/api/experimental_infobars.json
index c8e161e..c8e161e 100644
--- a/chrome/common/extensions/api/experimental.infobars.json
+++ b/chrome/common/extensions/api/experimental_infobars.json
diff --git a/chrome/common/extensions/api/experimental.input.ui.json b/chrome/common/extensions/api/experimental_input_ui.json
index 303d947..303d947 100644
--- a/chrome/common/extensions/api/experimental.input.ui.json
+++ b/chrome/common/extensions/api/experimental_input_ui.json
diff --git a/chrome/common/extensions/api/experimental.input.virtualKeyboard.json b/chrome/common/extensions/api/experimental_input_virtual_keyboard.json
index 6845d8f..6845d8f 100644
--- a/chrome/common/extensions/api/experimental.input.virtualKeyboard.json
+++ b/chrome/common/extensions/api/experimental_input_virtual_keyboard.json
diff --git a/chrome/common/extensions/api/experimental.keybinding.json b/chrome/common/extensions/api/experimental_keybinding.json
index 3816cbb..3816cbb 100644
--- a/chrome/common/extensions/api/experimental.keybinding.json
+++ b/chrome/common/extensions/api/experimental_keybinding.json
diff --git a/chrome/common/extensions/api/experimental.mediaGalleries.json b/chrome/common/extensions/api/experimental_media_galleries.json
index c9d3cd1..c9d3cd1 100644
--- a/chrome/common/extensions/api/experimental.mediaGalleries.json
+++ b/chrome/common/extensions/api/experimental_media_galleries.json
diff --git a/chrome/common/extensions/api/experimental.offscreenTabs.json b/chrome/common/extensions/api/experimental_offscreen_tabs.json
index 1058a67..1058a67 100644
--- a/chrome/common/extensions/api/experimental.offscreenTabs.json
+++ b/chrome/common/extensions/api/experimental_offscreen_tabs.json
diff --git a/chrome/common/extensions/api/experimental.processes.json b/chrome/common/extensions/api/experimental_processes.json
index be7cf52..be7cf52 100644
--- a/chrome/common/extensions/api/experimental.processes.json
+++ b/chrome/common/extensions/api/experimental_processes.json
diff --git a/chrome/common/extensions/api/experimental.record.json b/chrome/common/extensions/api/experimental_record.json
index fe8c04c..fe8c04c 100644
--- a/chrome/common/extensions/api/experimental.record.json
+++ b/chrome/common/extensions/api/experimental_record.json
diff --git a/chrome/common/extensions/api/experimental.rlz.json b/chrome/common/extensions/api/experimental_rlz.json
index b954a4e..b954a4e 100644
--- a/chrome/common/extensions/api/experimental.rlz.json
+++ b/chrome/common/extensions/api/experimental_rlz.json
diff --git a/chrome/common/extensions/api/experimental.runtime.json b/chrome/common/extensions/api/experimental_runtime.json
index ad37160..ad37160 100644
--- a/chrome/common/extensions/api/experimental.runtime.json
+++ b/chrome/common/extensions/api/experimental_runtime.json
diff --git a/chrome/common/extensions/api/experimental.serial.idl b/chrome/common/extensions/api/experimental_serial.idl
index dab96431..dab96431 100644
--- a/chrome/common/extensions/api/experimental.serial.idl
+++ b/chrome/common/extensions/api/experimental_serial.idl
diff --git a/chrome/common/extensions/api/experimental.socket.idl b/chrome/common/extensions/api/experimental_socket.idl
index 37aa003..37aa003 100644
--- a/chrome/common/extensions/api/experimental.socket.idl
+++ b/chrome/common/extensions/api/experimental_socket.idl
diff --git a/chrome/common/extensions/api/experimental.speechInput.json b/chrome/common/extensions/api/experimental_speech_input.json
index 280eb9d..280eb9d 100644
--- a/chrome/common/extensions/api/experimental.speechInput.json
+++ b/chrome/common/extensions/api/experimental_speech_input.json
diff --git a/chrome/common/extensions/api/experimental.usb.idl b/chrome/common/extensions/api/experimental_usb.idl
index 82d0a02..82d0a02 100644
--- a/chrome/common/extensions/api/experimental.usb.idl
+++ b/chrome/common/extensions/api/experimental_usb.idl
diff --git a/chrome/common/extensions/api/fileBrowserHandler.json b/chrome/common/extensions/api/file_browser_handler.json
index 32d54d7..32d54d7 100644
--- a/chrome/common/extensions/api/fileBrowserHandler.json
+++ b/chrome/common/extensions/api/file_browser_handler.json
diff --git a/chrome/common/extensions/api/fileBrowserPrivate.json b/chrome/common/extensions/api/file_browser_private.json
index 9994c40..9994c40 100644
--- a/chrome/common/extensions/api/fileBrowserPrivate.json
+++ b/chrome/common/extensions/api/file_browser_private.json
diff --git a/chrome/common/extensions/api/input.ime.json b/chrome/common/extensions/api/input_ime.json
index 9b96ca9..9b96ca9 100644
--- a/chrome/common/extensions/api/input.ime.json
+++ b/chrome/common/extensions/api/input_ime.json
diff --git a/chrome/common/extensions/api/inputMethodPrivate.json b/chrome/common/extensions/api/input_method_private.json
index 6c44192..6c44192 100644
--- a/chrome/common/extensions/api/inputMethodPrivate.json
+++ b/chrome/common/extensions/api/input_method_private.json
diff --git a/chrome/common/extensions/api/managedModePrivate.json b/chrome/common/extensions/api/managed_mode_private.json
index 256f18a..256f18a 100644
--- a/chrome/common/extensions/api/managedModePrivate.json
+++ b/chrome/common/extensions/api/managed_mode_private.json
diff --git a/chrome/common/extensions/api/mediaPlayerPrivate.json b/chrome/common/extensions/api/media_player_private.json
index fef30a0..fef30a0 100644
--- a/chrome/common/extensions/api/mediaPlayerPrivate.json
+++ b/chrome/common/extensions/api/media_player_private.json
diff --git a/chrome/common/extensions/api/metricsPrivate.json b/chrome/common/extensions/api/metrics_private.json
index 0113563..0113563 100644
--- a/chrome/common/extensions/api/metricsPrivate.json
+++ b/chrome/common/extensions/api/metrics_private.json
diff --git a/chrome/common/extensions/api/pageAction.json b/chrome/common/extensions/api/page_action.json
index 5f0031a..5f0031a 100644
--- a/chrome/common/extensions/api/pageAction.json
+++ b/chrome/common/extensions/api/page_action.json
diff --git a/chrome/common/extensions/api/pageActions.json b/chrome/common/extensions/api/page_actions.json
index 7283439..7283439 100644
--- a/chrome/common/extensions/api/pageActions.json
+++ b/chrome/common/extensions/api/page_actions.json
diff --git a/chrome/common/extensions/api/pageCapture.json b/chrome/common/extensions/api/page_capture.json
index 5b8fe85..5b8fe85 100644
--- a/chrome/common/extensions/api/pageCapture.json
+++ b/chrome/common/extensions/api/page_capture.json
diff --git a/chrome/common/extensions/api/systemPrivate.json b/chrome/common/extensions/api/system_private.json
index ec6cc53..ec6cc53 100644
--- a/chrome/common/extensions/api/systemPrivate.json
+++ b/chrome/common/extensions/api/system_private.json
diff --git a/chrome/common/extensions/api/terminalPrivate.json b/chrome/common/extensions/api/terminal_private.json
index 7b8802b..7b8802b 100644
--- a/chrome/common/extensions/api/terminalPrivate.json
+++ b/chrome/common/extensions/api/terminal_private.json
diff --git a/chrome/common/extensions/api/topSites.json b/chrome/common/extensions/api/top_sites.json
index e220447..e220447 100644
--- a/chrome/common/extensions/api/topSites.json
+++ b/chrome/common/extensions/api/top_sites.json
diff --git a/chrome/common/extensions/api/ttsEngine.json b/chrome/common/extensions/api/tts_engine.json
index 6279ccc..6279ccc 100644
--- a/chrome/common/extensions/api/ttsEngine.json
+++ b/chrome/common/extensions/api/tts_engine.json
diff --git a/chrome/common/extensions/api/webNavigation.json b/chrome/common/extensions/api/web_navigation.json
index cbfc720..cbfc720 100644
--- a/chrome/common/extensions/api/webNavigation.json
+++ b/chrome/common/extensions/api/web_navigation.json
diff --git a/chrome/common/extensions/api/webRequest.json b/chrome/common/extensions/api/web_request.json
index 3861788..3861788 100644
--- a/chrome/common/extensions/api/webRequest.json
+++ b/chrome/common/extensions/api/web_request.json
diff --git a/chrome/common/extensions/api/webSocketProxyPrivate.json b/chrome/common/extensions/api/web_socket_proxy_private.json
index 4afa792..4afa792 100644
--- a/chrome/common/extensions/api/webSocketProxyPrivate.json
+++ b/chrome/common/extensions/api/web_socket_proxy_private.json
diff --git a/chrome/common/extensions/api/webstorePrivate.json b/chrome/common/extensions/api/webstore_private.json
index 64db63c..64db63c 100644
--- a/chrome/common/extensions/api/webstorePrivate.json
+++ b/chrome/common/extensions/api/webstore_private.json
diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js
index 178e41a..b6a4de9 100644
--- a/chrome/common/extensions/docs/js/api_page_generator.js
+++ b/chrome/common/extensions/docs/js/api_page_generator.js
@@ -22,65 +22,65 @@ var API_TEMPLATE = 'template/api_template.html';
 var MODULE_SCHEMAS = [
   '../api/alarms.json',  // autogenerated
   '../api/bookmarks.json',
-  '../api/browserAction.json',
-  '../api/browsingData.json',
-  '../api/chromeAuthPrivate.json',
-  '../api/chromeosInfoPrivate.json',
-  '../api/contentSettings.json',
-  '../api/contextMenus.json',
+  '../api/browser_action.json',
+  '../api/browsing_data.json',
+  '../api/chrome_auth_private.json',
+  '../api/chromeos_info_private.json',
+  '../api/content_settings.json',
+  '../api/context_menus.json',
   '../api/cookies.json',
   '../api/debugger.json',
   '../api/declarative.json',
-  '../api/declarativeWebRequest.json',
+  '../api/declarative_web_request.json',
   '../api/devtools.json',
-  '../api/experimental.accessibility.json',
-  '../api/experimental.app.json',
-  '../api/experimental.bookmarkManager.json',
-  '../api/experimental.downloads.json',
-  '../api/experimental.fontSettings.json',
-  '../api/experimental.identity.json',
-  '../api/experimental.infobars.json',
-  '../api/experimental.input.ui.json',
-  '../api/experimental.input.virtualKeyboard.json',
-  '../api/experimental.keybinding.json',
-  '../api/experimental.mediaGalleries.json',
-  '../api/experimental.offscreenTabs.json',
-  '../api/experimental.processes.json',
-  '../api/experimental.rlz.json',
-  '../api/experimental.runtime.json',
-  '../api/experimental.speechInput.json',
+  '../api/experimental_accessibility.json',
+  '../api/experimental_app.json',
+  '../api/experimental_bookmark_manager.json',
+  '../api/experimental_downloads.json',
+  '../api/experimental_font_settings.json',
+  '../api/experimental_identity.json',
+  '../api/experimental_infobars.json',
+  '../api/experimental_input_ui.json',
+  '../api/experimental_input_virtual_keyboard.json',
+  '../api/experimental_keybinding.json',
+  '../api/experimental_media_galleries.json',
+  '../api/experimental_offscreen_tabs.json',
+  '../api/experimental_processes.json',
+  '../api/experimental_rlz.json',
+  '../api/experimental_runtime.json',
+  '../api/experimental_speech_input.json',
   '../api/extension.json',
-  '../api/fileBrowserHandler.json',
-  '../api/fileBrowserPrivate.json',
+  '../api/file_browser_handler.json',
+  '../api/file_browser_private.json',
   '../api/history.json',
   '../api/i18n.json',
   '../api/idle.json',
-  '../api/input.ime.json',
-  '../api/inputMethodPrivate.json',
-  '../api/managedModePrivate.json',
+  '../api/input_ime.json',
+  '../api/input_method_private.json',
+  '../api/managed_mode_private.json',
   '../api/management.json',
-  '../api/mediaPlayerPrivate.json',
-  '../api/metricsPrivate.json',
+  '../api/media_player_private.json',
+  '../api/metrics_private.json',
   '../api/omnibox.json',
-  '../api/pageAction.json',
-  '../api/pageActions.json',
-  '../api/pageCapture.json',
+  '../api/page_action.json',
+  '../api/page_actions.json',
+  '../api/page_capture.json',
   '../api/permissions.json',
   '../api/privacy.json',
   '../api/proxy.json',
   '../api/storage.json',
-  '../api/systemPrivate.json',
+  '../api/system_private.json',
   '../api/tabs.json',
   '../api/test.json',
-  '../api/topSites.json',
+  '../api/top_sites.json',
   '../api/tts.json',
-  '../api/ttsEngine.json',
+  '../api/tts_engine.json',
   '../api/types.json',
-  '../api/webNavigation.json',
-  '../api/webRequest.json',
-  '../api/webSocketProxyPrivate.json',
+  '../api/web_navigation.json',
+  '../api/web_request.json',
+  '../api/web_socket_proxy_private.json',
   '../api/webstore.json',
-  '../api/webstorePrivate.json',
+  '../api/webstore_private.json',
   '../api/windows.json',
 ]
 var PERMISSION_FEATURES = '../api/_permission_features.json';
diff --git a/chrome/common/extensions_api_resources.grd b/chrome/common/extensions_api_resources.grd
index 12a310b..3d9d812 100644
--- a/chrome/common/extensions_api_resources.grd
+++ b/chrome/common/extensions_api_resources.grd
@@ -11,68 +11,68 @@
     <includes>
       <include name="IDR_EXTENSION_API_JSON_APP" file="extensions\api\app.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_BOOKMARKS" file="extensions\api\bookmarks.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_BROWSERACTION" file="extensions\api\browserAction.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_BROWSINGDATA" file="extensions\api\browsingData.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_CHROMEAUTHPRIVATE" file="extensions\api\chromeAuthPrivate.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_CHROMEOSINFOPRIVATE" file="extensions\api\chromeosInfoPrivate.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_CONTENTSETTINGS" file="extensions\api\contentSettings.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_CONTEXTMENUS" file="extensions\api\contextMenus.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_BROWSERACTION" file="extensions\api\browser_action.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_BROWSINGDATA" file="extensions\api\browsing_data.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CHROMEAUTHPRIVATE" file="extensions\api\chrome_auth_private.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CHROMEOSINFOPRIVATE" file="extensions\api\chromeos_info_private.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CONTENTSETTINGS" file="extensions\api\content_settings.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_CONTEXTMENUS" file="extensions\api\context_menus.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_COOKIES" file="extensions\api\cookies.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_DEBUGGER" file="extensions\api\debugger.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_DECLARATIVE" file="extensions\api\declarative.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_DECLARATIVE_WEBREQUEST" file="extensions\api\declarativeWebRequest.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_DECLARATIVE_WEBREQUEST" file="extensions\api\declarative_web_request.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_DEVTOOLS" file="extensions\api\devtools.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_ECHOPRIVATE" file="extensions\api\echoPrivate.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY" file="extensions\api\experimental.accessibility.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP" file="extensions\api\experimental.app.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER" file="extensions\api\experimental.bookmarkManager.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTSSETTINGS" file="extensions\api\experimental.fontSettings.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_IDENTITY" file="extensions\api\experimental.identity.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING" file="extensions\api\experimental.keybinding.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_MEDIAGALLERIES" file="extensions\api\experimental.mediaGalleries.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_OFFSCREENTABS" file="extensions\api\experimental.offscreenTabs.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental.processes.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RECORD" file="extensions\api\experimental.record.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RLZ" file="extensions\api\experimental.rlz.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RUNTIME" file="extensions\api\experimental.runtime.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_SPEECHINPUT" file="extensions\api\experimental.speechInput.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_ECHOPRIVATE" file="extensions\api\echo_private.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY" file="extensions\api\experimental_accessibility.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP" file="extensions\api\experimental_app.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER" file="extensions\api\experimental_bookmark_manager.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental_downloads.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTSSETTINGS" file="extensions\api\experimental_font_settings.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_IDENTITY" file="extensions\api\experimental_identity.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental_infobars.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental_input_ui.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental_input_virtual_keyboard.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING" file="extensions\api\experimental_keybinding.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_MEDIAGALLERIES" file="extensions\api\experimental_media_galleries.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_OFFSCREENTABS" file="extensions\api\experimental_offscreen_tabs.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental_processes.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RECORD" file="extensions\api\experimental_record.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RLZ" file="extensions\api\experimental_rlz.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RUNTIME" file="extensions\api\experimental_runtime.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_SPEECHINPUT" file="extensions\api\experimental_speech_input.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_EXTENSION" file="extensions\api\extension.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERHANDLER" file="extensions\api\fileBrowserHandler.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE" file="extensions\api\fileBrowserPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERHANDLER" file="extensions\api\file_browser_handler.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE" file="extensions\api\file_browser_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_HISTORY" file="extensions\api\history.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_I18N" file="extensions\api\i18n.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input.ime.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input_ime.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_IDLE" file="extensions\api\idle.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\inputMethodPrivate.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_MANAGEDMODEPRIVATE" file="extensions\api\managedModePrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\input_method_private.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_MANAGEDMODEPRIVATE" file="extensions\api\managed_mode_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_MANAGEMENT" file="extensions\api\management.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE" file="extensions\api\mediaPlayerPrivate.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_METRICSPRIVATE" file="extensions\api\metricsPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE" file="extensions\api\media_player_private.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_METRICSPRIVATE" file="extensions\api\metrics_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_OMNIBOX" file="extensions\api\omnibox.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_PAGEACTION" file="extensions\api\pageAction.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_PAGEACTIONS" file="extensions\api\pageActions.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_PAGECAPTURE" file="extensions\api\pageCapture.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGEACTION" file="extensions\api\page_action.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGEACTIONS" file="extensions\api\page_actions.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_PAGECAPTURE" file="extensions\api\page_capture.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_PERMISSIONS" file="extensions\api\permissions.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_PRIVACY" file="extensions\api\privacy.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_PROXY" file="extensions\api\proxy.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_STORAGE" file="extensions\api\storage.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_SYSTEMPRIVATE" file="extensions\api\systemPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_SYSTEMPRIVATE" file="extensions\api\system_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TABS" file="extensions\api\tabs.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_TERMINALPRIVATE" file="extensions\api\terminalPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TERMINALPRIVATE" file="extensions\api\terminal_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TEST" file="extensions\api\test.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_TOPSITES" file="extensions\api\topSites.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TOPSITES" file="extensions\api\top_sites.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\ttsEngine.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\tts_engine.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_TYPES" file="extensions\api\types.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_WEBNAVIGATION" file="extensions\api\webNavigation.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_WEBREQUEST" file="extensions\api\webRequest.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_WEBSOCKETPROXYPRIVATE" file="extensions\api\webSocketProxyPrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBNAVIGATION" file="extensions\api\web_navigation.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBREQUEST" file="extensions\api\web_request.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBSOCKETPROXYPRIVATE" file="extensions\api\web_socket_proxy_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_WEBSTORE" file="extensions\api\webstore.json" type="BINDATA" />
-      <include name="IDR_EXTENSION_API_JSON_WEBSTOREPRIVATE" file="extensions\api\webstorePrivate.json" type="BINDATA" />
+      <include name="IDR_EXTENSION_API_JSON_WEBSTOREPRIVATE" file="extensions\api\webstore_private.json" type="BINDATA" />
       <include name="IDR_EXTENSION_API_JSON_WINDOWS" file="extensions\api\windows.json" type="BINDATA" />
     </includes>
   </release>
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index 508e0f2..4ba5b37 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -33,7 +33,7 @@ class CCGenerator(object):
       .Append()
       .Append(self._util_cc_helper.GetIncludePath())
       .Append('#include "%s/%s.h"' %
-          (self._namespace.source_file_dir, self._namespace.name))
+          (self._namespace.source_file_dir, self._namespace.unix_name))
     )
     includes = self._cpp_type_generator.GenerateIncludes()
     if not includes.IsEmpty():
diff --git a/tools/json_schema_compiler/compiler.py b/tools/json_schema_compiler/compiler.py
index 1d08841..593f687 100755
--- a/tools/json_schema_compiler/compiler.py
+++ b/tools/json_schema_compiler/compiler.py
@@ -38,12 +38,16 @@ def load_schema(schema):
   else:
     sys.exit("Did not recognize file extension %s for schema %s" %
              (schema_extension, schema))
+  if len(api_defs) != 1:
+    sys.exit("File %s has multiple schemas. Files are only allowed to contain a"
+             " single schema." % schema)
 
   return api_defs
 
 def handle_single_schema(filename, dest_dir, root, root_namespace):
   schema = os.path.normpath(filename)
   schema_filename, schema_extension = os.path.splitext(schema)
+  path, short_filename = os.path.split(schema_filename)
   api_defs = load_schema(schema)
 
   api_model = model.Model()
@@ -68,9 +72,13 @@ def handle_single_schema(filename, dest_dir, root, root_namespace):
     if not namespace:
       continue
 
+    if short_filename != namespace.unix_name:
+      sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
+               filename)
+
     # The output filename must match the input filename for gyp to deal with it
     # properly.
-    out_file = namespace.name
+    out_file = namespace.unix_name
     type_generator = cpp_type_generator.CppTypeGenerator(
         root_namespace, namespace, namespace.unix_name)
     for referenced_namespace in api_model.namespaces.values():
@@ -78,7 +86,7 @@ def handle_single_schema(filename, dest_dir, root, root_namespace):
         continue
       type_generator.AddNamespace(
           referenced_namespace,
-          referenced_namespace.name)
+          referenced_namespace.unix_name)
 
     h_code = (h_generator.HGenerator(namespace, type_generator)
         .Generate().Render())
@@ -113,14 +121,24 @@ def handle_bundle_schema(filenames, dest_dir, root, root_namespace):
 
   api_model = model.Model()
   relpath = os.path.relpath(os.path.normpath(filenames[0]), root)
-  for target_namespace in api_defs:
-    api_model.AddNamespace(target_namespace, relpath)
+
+  for target_namespace, schema_filename in zip(api_defs, filenames):
+    namespace = api_model.AddNamespace(target_namespace, relpath)
+    path, filename = os.path.split(schema_filename)
+    short_filename, extension = os.path.splitext(filename)
+
+    # Filenames are checked against the unix_names of the namespaces they
+    # generate because the gyp uses the names of the JSON files to generate
+    # the names of the .cc and .h files. We want these to be using unix_names.
+    if namespace.unix_name != short_filename:
+      sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
+               schema_filename)
 
   type_generator = cpp_type_generator.CppTypeGenerator(root_namespace)
   for referenced_namespace in api_model.namespaces.values():
     type_generator.AddNamespace(
         referenced_namespace,
-        referenced_namespace.name)
+        referenced_namespace.unix_name)
 
   generator = schema_bundle_generator.SchemaBundleGenerator(
       api_model, api_defs, type_generator)
diff --git a/tools/json_schema_compiler/cpp_type_generator_test.py b/tools/json_schema_compiler/cpp_type_generator_test.py
index 46b10a2..70d3e74 100755
--- a/tools/json_schema_compiler/cpp_type_generator_test.py
+++ b/tools/json_schema_compiler/cpp_type_generator_test.py
@@ -23,17 +23,17 @@ class CppTypeGeneratorTest(unittest.TestCase):
     self.model.AddNamespace(self.tabs_json[0],
         'path/to/tabs.json')
     self.tabs = self.model.namespaces.get('tabs')
-    self.browser_action_json = CachedLoad('test/browserAction.json')
+    self.browser_action_json = CachedLoad('test/browser_action.json')
     self.model.AddNamespace(self.browser_action_json[0],
-        'path/to/browserAction.json')
+        'path/to/browser_action.json')
     self.browser_action = self.model.namespaces.get('browserAction')
-    self.font_settings_json = CachedLoad('test/fontSettings.json')
+    self.font_settings_json = CachedLoad('test/font_settings.json')
     self.model.AddNamespace(self.font_settings_json[0],
-        'path/to/fontSettings.json')
+        'path/to/font_settings.json')
     self.font_settings = self.model.namespaces.get('fontSettings')
-    self.dependency_tester_json = CachedLoad('test/dependencyTester.json')
+    self.dependency_tester_json = CachedLoad('test/dependency_tester.json')
     self.model.AddNamespace(self.dependency_tester_json[0],
-        'path/to/dependencyTester.json')
+        'path/to/dependency_tester.json')
     self.dependency_tester = self.model.namespaces.get('dependencyTester')
 
   def testGenerateIncludesAndForwardDeclarations(self):
@@ -82,9 +82,9 @@ class CppTypeGeneratorTest(unittest.TestCase):
   def testGenerateIncludesAndForwardDeclarationsDependencies(self):
     m = model.Model()
     browser_action_namespace = m.AddNamespace(self.browser_action_json[0],
-        'path/to/browserAction.json')
+        'path/to/browser_action.json')
     font_settings_namespace = m.AddNamespace(self.font_settings_json[0],
-        'path/to/fontSettings.json')
+        'path/to/font_settings.json')
     manager = CppTypeGenerator('', self.dependency_tester,
         self.dependency_tester.unix_name)
     manager.AddNamespace(browser_action_namespace,
diff --git a/tools/json_schema_compiler/test/additionalProperties.json b/tools/json_schema_compiler/test/additional_properties.json
index 03bbef8..03bbef8 100644
--- a/tools/json_schema_compiler/test/additionalProperties.json
+++ b/tools/json_schema_compiler/test/additional_properties.json
diff --git a/tools/json_schema_compiler/test/additional_properties_unittest.cc b/tools/json_schema_compiler/test/additional_properties_unittest.cc
index 978d6ff..ef0ab29 100644
--- a/tools/json_schema_compiler/test/additional_properties_unittest.cc
+++ b/tools/json_schema_compiler/test/additional_properties_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "tools/json_schema_compiler/test/additionalProperties.h"
+#include "tools/json_schema_compiler/test/additional_properties.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/tools/json_schema_compiler/test/browserAction.json b/tools/json_schema_compiler/test/browser_action.json
index 6288fab..6288fab 100644
--- a/tools/json_schema_compiler/test/browserAction.json
+++ b/tools/json_schema_compiler/test/browser_action.json
diff --git a/tools/json_schema_compiler/test/dependencyTester.json b/tools/json_schema_compiler/test/dependency_tester.json
index aec4c15..aec4c15 100644
--- a/tools/json_schema_compiler/test/dependencyTester.json
+++ b/tools/json_schema_compiler/test/dependency_tester.json
diff --git a/tools/json_schema_compiler/test/fontSettings.json b/tools/json_schema_compiler/test/font_settings.json
index be68083..be68083 100644
--- a/tools/json_schema_compiler/test/fontSettings.json
+++ b/tools/json_schema_compiler/test/font_settings.json
diff --git a/tools/json_schema_compiler/test/functionsOnTypes.json b/tools/json_schema_compiler/test/functions_on_types.json
index e8c8220..e8c8220 100644
--- a/tools/json_schema_compiler/test/functionsOnTypes.json
+++ b/tools/json_schema_compiler/test/functions_on_types.json
diff --git a/tools/json_schema_compiler/test/functions_on_types_unittest.cc b/tools/json_schema_compiler/test/functions_on_types_unittest.cc
index 41a276c..0694cb3 100644
--- a/tools/json_schema_compiler/test/functions_on_types_unittest.cc
+++ b/tools/json_schema_compiler/test/functions_on_types_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "tools/json_schema_compiler/test/functionsOnTypes.h"
+#include "tools/json_schema_compiler/test/functions_on_types.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/tools/json_schema_compiler/test/json_schema_compiler_tests.gyp b/tools/json_schema_compiler/test/json_schema_compiler_tests.gyp
index ecfd81a..f48809c 100644
--- a/tools/json_schema_compiler/test/json_schema_compiler_tests.gyp
+++ b/tools/json_schema_compiler/test/json_schema_compiler_tests.gyp
@@ -11,12 +11,12 @@
         'chromium_code': 1,
         'json_schema_files': [
           'any.json',
-          'additionalProperties.json',
+          'additional_properties.json',
           'arrays.json',
           'choices.json',
           'crossref.json',
           'enums.json',
-          'functionsOnTypes.json',
+          'functions_on_types.json',
           'objects.json',
           'simple_api.json',
         ],