diff --git a/hphp/hhvm/process_init.cpp b/hphp/hhvm/process_init.cpp
index 2a50ea839..10655cefe 100644
--- a/hphp/hhvm/process_init.cpp
+++ b/hphp/hhvm/process_init.cpp
@@ -24,7 +24,7 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 #include "hphp/runtime/vm/jit/translator.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/fixup.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/file_repository.h"
diff --git a/hphp/runtime/base/file_repository.cpp b/hphp/runtime/base/file_repository.cpp
index def44be6e..98f9bbd91 100644
--- a/hphp/runtime/base/file_repository.cpp
+++ b/hphp/runtime/base/file_repository.cpp
@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/stat_cache.h"
 #include "hphp/runtime/base/server/source_root_info.h"
 
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/pendq.h"
diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp
index 1b536fc77..1f5b54231 100644
--- a/hphp/runtime/base/intercept.cpp
+++ b/hphp/runtime/base/intercept.cpp
@@ -19,7 +19,7 @@
 #include "hphp/runtime/base/array/array_iterator.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/event_hook.h"
 
diff --git a/hphp/runtime/base/string_data.cpp b/hphp/runtime/base/string_data.cpp
index 9478cd404..bebf494d8 100644
--- a/hphp/runtime/base/string_data.cpp
+++ b/hphp/runtime/base/string_data.cpp
@@ -28,7 +28,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "tbb/concurrent_hash_map.h"
 
 namespace HPHP {
diff --git a/hphp/runtime/base/thread_info.cpp b/hphp/runtime/base/thread_info.cpp
index 3c7f00da6..37eeda2f7 100644
--- a/hphp/runtime/base/thread_info.cpp
+++ b/hphp/runtime/base/thread_info.cpp
@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/hphp_system.h"
 #include "hphp/runtime/base/code_coverage.h"
 #include "hphp/runtime/base/memory/smart_allocator.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/alloc.h"
 
diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp
index 634a05c86..e2d560970 100644
--- a/hphp/runtime/vm/bytecode.cpp
+++ b/hphp/runtime/vm/bytecode.cpp
@@ -50,7 +50,7 @@
 #include "hphp/runtime/vm/php_debug.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/type_constraint.h"
 #include "hphp/runtime/vm/unwind.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
diff --git a/hphp/runtime/vm/class.cpp b/hphp/runtime/vm/class.cpp
index 17a678022..d3d37aa78 100644
--- a/hphp/runtime/vm/class.cpp
+++ b/hphp/runtime/vm/class.cpp
@@ -18,7 +18,7 @@
 #include "hphp/runtime/base/array/hphp_array.h"
 #include "hphp/util/util.h"
 #include "hphp/util/debug.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/treadmill.h"
 #include "hphp/runtime/vm/name_value_table.h"
diff --git a/hphp/runtime/vm/event_hook.h b/hphp/runtime/vm/event_hook.h
index a7286122a..3803cf8bd 100644
--- a/hphp/runtime/vm/event_hook.h
+++ b/hphp/runtime/vm/event_hook.h
@@ -18,7 +18,7 @@
 
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/bytecode.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 
 namespace HPHP {
 
diff --git a/hphp/runtime/vm/func.cpp b/hphp/runtime/vm/func.cpp
index 0066583af..cee71182e 100644
--- a/hphp/runtime/vm/func.cpp
+++ b/hphp/runtime/vm/func.cpp
@@ -26,7 +26,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/repo.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/file_repository.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/blob_helper.h"
diff --git a/hphp/runtime/vm/funcdict.cpp b/hphp/runtime/vm/funcdict.cpp
index 7010e2bea..8c7e6f258 100644
--- a/hphp/runtime/vm/funcdict.cpp
+++ b/hphp/runtime/vm/funcdict.cpp
@@ -23,7 +23,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 #include "hphp/runtime/vm/jit/translator.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/unit.h"
 
 #include "hphp/system/systemlib.h"
diff --git a/hphp/runtime/vm/jit/abi-x64.h b/hphp/runtime/vm/jit/abi-x64.h
index f1c16dbf5..0cca74554 100644
--- a/hphp/runtime/vm/jit/abi-x64.h
+++ b/hphp/runtime/vm/jit/abi-x64.h
@@ -27,7 +27,7 @@
 #define incl_HPHP_VM_RUNTIME_TRANSLATOR_ABI_X64_H_
 
 #include "hphp/util/asm-x64.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 
 namespace HPHP { namespace Transl {
 
diff --git a/hphp/runtime/vm/jit/block.h b/hphp/runtime/vm/jit/block.h
index df981e36a..6750ba5aa 100644
--- a/hphp/runtime/vm/jit/block.h
+++ b/hphp/runtime/vm/jit/block.h
@@ -20,7 +20,7 @@
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/edge.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/check.cpp b/hphp/runtime/vm/jit/check.cpp
index e7673971e..190760d35 100644
--- a/hphp/runtime/vm/jit/check.cpp
+++ b/hphp/runtime/vm/jit/check.cpp
@@ -19,9 +19,9 @@
 #include <unordered_set>
 
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 
 namespace HPHP {  namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/codegen.cpp b/hphp/runtime/vm/jit/code-gen.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/codegen.cpp
rename to hphp/runtime/vm/jit/code-gen.cpp
index 67539a2c0..3d2bd5c46 100644
--- a/hphp/runtime/vm/jit/codegen.cpp
+++ b/hphp/runtime/vm/jit/code-gen.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
 
 #include <cstring>
 #include <unwind.h>
@@ -36,7 +36,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/jit/translator-x64-internal.h"
@@ -44,8 +44,8 @@
 #include "hphp/runtime/vm/jit/types.h"
 #include "hphp/runtime/vm/jit/x64-util.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
-#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/native-calls.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/layout.h"
 
diff --git a/hphp/runtime/vm/jit/codegen.h b/hphp/runtime/vm/jit/code-gen.h
similarity index 99%
rename from hphp/runtime/vm/jit/codegen.h
rename to hphp/runtime/vm/jit/code-gen.h
index b69e6be69..590a59059 100644
--- a/hphp/runtime/vm/jit/codegen.h
+++ b/hphp/runtime/vm/jit/code-gen.h
@@ -19,11 +19,11 @@
 
 #include <vector>
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP {
 namespace JIT {
diff --git a/hphp/runtime/vm/jit/cse.h b/hphp/runtime/vm/jit/cse.h
index e51a85437..9534f1021 100644
--- a/hphp/runtime/vm/jit/cse.h
+++ b/hphp/runtime/vm/jit/cse.h
@@ -23,7 +23,7 @@
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/cfg.h"
-#include "hphp/runtime/vm/jit/ssatmp.h"
+#include "hphp/runtime/vm/jit/ssa-tmp.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/dce.cpp b/hphp/runtime/vm/jit/dce.cpp
index cbcf980a2..78f87a7d2 100644
--- a/hphp/runtime/vm/jit/dce.cpp
+++ b/hphp/runtime/vm/jit/dce.cpp
@@ -19,9 +19,9 @@
 #include "hphp/util/trace.h"
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/opt.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 #include "hphp/runtime/vm/jit/mutation.h"
 
 namespace HPHP {
diff --git a/hphp/runtime/vm/jit/extradata.h b/hphp/runtime/vm/jit/extra-data.h
similarity index 100%
rename from hphp/runtime/vm/jit/extradata.h
rename to hphp/runtime/vm/jit/extra-data.h
diff --git a/hphp/runtime/vm/jit/hhbctranslator.cpp b/hphp/runtime/vm/jit/hhbc-translator.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/hhbctranslator.cpp
rename to hphp/runtime/vm/jit/hhbc-translator.cpp
index 33f975dfb..858b254dc 100644
--- a/hphp/runtime/vm/jit/hhbctranslator.cpp
+++ b/hphp/runtime/vm/jit/hhbc-translator.cpp
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/ext/ext_closure.h"
@@ -23,8 +23,8 @@
 #include "hphp/runtime/base/stats.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/runtime.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/codegen.h" // ArrayIdx helpers
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/code-gen.h" // ArrayIdx helpers
 
 // Include last to localize effects to this file
 #include "hphp/util/assert_throw.h"
diff --git a/hphp/runtime/vm/jit/hhbctranslator.h b/hphp/runtime/vm/jit/hhbc-translator.h
similarity index 99%
rename from hphp/runtime/vm/jit/hhbctranslator.h
rename to hphp/runtime/vm/jit/hhbc-translator.h
index 48e767140..aa07e4e58 100644
--- a/hphp/runtime/vm/jit/hhbctranslator.h
+++ b/hphp/runtime/vm/jit/hhbc-translator.h
@@ -25,7 +25,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/member_operations.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/runtime/vm/srckey.h"
 
 using HPHP::Transl::NormalizedInstruction;
diff --git a/hphp/runtime/vm/jit/irfactory.cpp b/hphp/runtime/vm/jit/ir-factory.cpp
similarity index 97%
rename from hphp/runtime/vm/jit/irfactory.cpp
rename to hphp/runtime/vm/jit/ir-factory.cpp
index 302fb111a..be0861553 100644
--- a/hphp/runtime/vm/jit/irfactory.cpp
+++ b/hphp/runtime/vm/jit/ir-factory.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 #include "hphp/runtime/vm/jit/block.h"
 
diff --git a/hphp/runtime/vm/jit/irfactory.h b/hphp/runtime/vm/jit/ir-factory.h
similarity index 100%
rename from hphp/runtime/vm/jit/irfactory.h
rename to hphp/runtime/vm/jit/ir-factory.h
diff --git a/hphp/runtime/vm/jit/irinstruction.h b/hphp/runtime/vm/jit/ir-instruction.h
similarity index 99%
rename from hphp/runtime/vm/jit/irinstruction.h
rename to hphp/runtime/vm/jit/ir-instruction.h
index 510407de3..925161146 100644
--- a/hphp/runtime/vm/jit/irinstruction.h
+++ b/hphp/runtime/vm/jit/ir-instruction.h
@@ -19,7 +19,7 @@
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/edge.h"
-#include "hphp/runtime/vm/jit/extradata.h"
+#include "hphp/runtime/vm/jit/extra-data.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/irtranslator.cpp b/hphp/runtime/vm/jit/ir-translator.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/irtranslator.cpp
rename to hphp/runtime/vm/jit/ir-translator.cpp
index 54f5b9ee8..2bfbaa1a7 100644
--- a/hphp/runtime/vm/jit/irtranslator.cpp
+++ b/hphp/runtime/vm/jit/ir-translator.cpp
@@ -26,16 +26,16 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/opt.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
-#include "hphp/runtime/vm/jit/codegen.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/check.h"
 
diff --git a/hphp/runtime/vm/jit/ir.cpp b/hphp/runtime/vm/jit/ir.cpp
index 7d0b0dceb..0524f6dd0 100644
--- a/hphp/runtime/vm/jit/ir.cpp
+++ b/hphp/runtime/vm/jit/ir.cpp
@@ -31,9 +31,9 @@
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/runtime/vm/jit/cse.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
 #include "hphp/runtime/vm/jit/trace.h"
diff --git a/hphp/runtime/vm/jit/ir.h b/hphp/runtime/vm/jit/ir.h
index a80d49ee1..3eede77b7 100644
--- a/hphp/runtime/vm/jit/ir.h
+++ b/hphp/runtime/vm/jit/ir.h
@@ -40,7 +40,7 @@
 #include "hphp/util/asm-x64.h"
 #include "hphp/util/trace.h"
 #include "hphp/runtime/ext/ext_continuation.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include "hphp/runtime/vm/jit/types.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
diff --git a/hphp/runtime/vm/jit/jumpopts.cpp b/hphp/runtime/vm/jit/jump-opts.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/jumpopts.cpp
rename to hphp/runtime/vm/jit/jump-opts.cpp
index a96017dcf..34c39158f 100644
--- a/hphp/runtime/vm/jit/jumpopts.cpp
+++ b/hphp/runtime/vm/jit/jump-opts.cpp
@@ -20,7 +20,7 @@
 
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/opt.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/layout.cpp b/hphp/runtime/vm/jit/layout.cpp
index a47b7a513..b18de4442 100644
--- a/hphp/runtime/vm/jit/layout.cpp
+++ b/hphp/runtime/vm/jit/layout.cpp
@@ -20,7 +20,7 @@
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/vm/jit/cfg.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/linearscan.cpp b/hphp/runtime/vm/jit/linear-scan.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/linearscan.cpp
rename to hphp/runtime/vm/jit/linear-scan.cpp
index 9eb31a648..3f1228fc1 100644
--- a/hphp/runtime/vm/jit/linearscan.cpp
+++ b/hphp/runtime/vm/jit/linear-scan.cpp
@@ -14,18 +14,18 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 
 #include "hphp/runtime/base/memory/smart_containers.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/native-calls.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
-#include "hphp/runtime/vm/jit/codegen.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 #include "hphp/runtime/vm/jit/check.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include <boost/noncopyable.hpp>
 
diff --git a/hphp/runtime/vm/jit/linearscan.h b/hphp/runtime/vm/jit/linear-scan.h
similarity index 98%
rename from hphp/runtime/vm/jit/linearscan.h
rename to hphp/runtime/vm/jit/linear-scan.h
index 898d446e1..710e15953 100644
--- a/hphp/runtime/vm/jit/linearscan.h
+++ b/hphp/runtime/vm/jit/linear-scan.h
@@ -17,8 +17,8 @@
 #ifndef incl_HPHP_VM_LINEAR_SCAN_H_
 #define incl_HPHP_VM_LINEAR_SCAN_H_
 
-#include "hphp/runtime/vm/jit/state_vector.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
 
 namespace HPHP {  namespace JIT {
diff --git a/hphp/runtime/vm/jit/mutation.cpp b/hphp/runtime/vm/jit/mutation.cpp
index aee69fd59..e4bab00cc 100644
--- a/hphp/runtime/vm/jit/mutation.cpp
+++ b/hphp/runtime/vm/jit/mutation.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 #include "hphp/runtime/vm/jit/mutation.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/nativecalls.cpp b/hphp/runtime/vm/jit/native-calls.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/nativecalls.cpp
rename to hphp/runtime/vm/jit/native-calls.cpp
index d0383c9e3..85a3f67a5 100644
--- a/hphp/runtime/vm/jit/nativecalls.cpp
+++ b/hphp/runtime/vm/jit/native-calls.cpp
@@ -14,11 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/nativecalls.h"
+#include "hphp/runtime/vm/jit/native-calls.h"
 
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/base/stats.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-runtime.h"
 #include "hphp/runtime/vm/jit/ir.h"
 
diff --git a/hphp/runtime/vm/jit/nativecalls.h b/hphp/runtime/vm/jit/native-calls.h
similarity index 98%
rename from hphp/runtime/vm/jit/nativecalls.h
rename to hphp/runtime/vm/jit/native-calls.h
index b1c954f62..3443cb603 100644
--- a/hphp/runtime/vm/jit/nativecalls.h
+++ b/hphp/runtime/vm/jit/native-calls.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "hphp/runtime/vm/jit/types.h"
-#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
 
 namespace HPHP {  namespace JIT { namespace NativeCalls {
 
diff --git a/hphp/runtime/vm/jit/opt.cpp b/hphp/runtime/vm/jit/opt.cpp
index b512c5656..06bdf2ce8 100644
--- a/hphp/runtime/vm/jit/opt.cpp
+++ b/hphp/runtime/vm/jit/opt.cpp
@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 #include "hphp/runtime/vm/jit/opt.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 #include "hphp/runtime/vm/jit/print.h"
 #include "hphp/runtime/vm/jit/check.h"
 
diff --git a/hphp/runtime/vm/jit/physreg.cpp b/hphp/runtime/vm/jit/phys-reg.cpp
similarity index 97%
rename from hphp/runtime/vm/jit/physreg.cpp
rename to hphp/runtime/vm/jit/phys-reg.cpp
index 29cbdc1fd..5d5d9ef6c 100644
--- a/hphp/runtime/vm/jit/physreg.cpp
+++ b/hphp/runtime/vm/jit/phys-reg.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 
 namespace HPHP { namespace Transl {
 
diff --git a/hphp/runtime/vm/jit/physreg.h b/hphp/runtime/vm/jit/phys-reg.h
similarity index 99%
rename from hphp/runtime/vm/jit/physreg.h
rename to hphp/runtime/vm/jit/phys-reg.h
index 659609fdc..ef7e65505 100644
--- a/hphp/runtime/vm/jit/physreg.h
+++ b/hphp/runtime/vm/jit/phys-reg.h
@@ -293,4 +293,3 @@ struct PhysRegSaver : public PhysRegSaverParity {
 }}
 
 #endif
-
diff --git a/hphp/runtime/vm/jit/predictionopts.cpp b/hphp/runtime/vm/jit/prediction-opts.cpp
similarity index 98%
rename from hphp/runtime/vm/jit/predictionopts.cpp
rename to hphp/runtime/vm/jit/prediction-opts.cpp
index 2e9d95676..ba82163ca 100644
--- a/hphp/runtime/vm/jit/predictionopts.cpp
+++ b/hphp/runtime/vm/jit/prediction-opts.cpp
@@ -19,8 +19,8 @@
 #include "folly/Optional.h"
 #include "folly/Lazy.h"
 
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 #include "hphp/runtime/vm/jit/ir.h"
 #include "hphp/runtime/vm/jit/cfg.h"
 #include "hphp/runtime/vm/jit/mutation.h"
diff --git a/hphp/runtime/vm/jit/print.cpp b/hphp/runtime/vm/jit/print.cpp
index 1f2398039..699a9cdb3 100644
--- a/hphp/runtime/vm/jit/print.cpp
+++ b/hphp/runtime/vm/jit/print.cpp
@@ -17,8 +17,8 @@
 
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
-#include "hphp/runtime/vm/jit/codegen.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
+#include "hphp/runtime/vm/jit/code-gen.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/util/disasm.h"
 #include "hphp/util/text_color.h"
diff --git a/hphp/runtime/vm/jit/print.h b/hphp/runtime/vm/jit/print.h
index 0a54d2247..216c3bc96 100644
--- a/hphp/runtime/vm/jit/print.h
+++ b/hphp/runtime/vm/jit/print.h
@@ -19,7 +19,7 @@
 
 #include <iosfwd>
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/jit/linearscan.h"
+#include "hphp/runtime/vm/jit/linear-scan.h"
 
 namespace HPHP {
 namespace JIT {
diff --git a/hphp/runtime/vm/jit/region_method.cpp b/hphp/runtime/vm/jit/region-method.cpp
similarity index 98%
rename from hphp/runtime/vm/jit/region_method.cpp
rename to hphp/runtime/vm/jit/region-method.cpp
index a54fd493e..c5b623d25 100644
--- a/hphp/runtime/vm/jit/region_method.cpp
+++ b/hphp/runtime/vm/jit/region-method.cpp
@@ -15,7 +15,7 @@
 */
 #include "hphp/util/arena.h"
 #include "hphp/runtime/base/memory/smart_containers.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/vm/verifier/cfg.h"
 
 namespace HPHP { namespace JIT {
@@ -109,4 +109,3 @@ RegionDescPtr regionMethod(const RegionContext& context) {
 //////////////////////////////////////////////////////////////////////
 
 }}
-
diff --git a/hphp/runtime/vm/jit/region_onebc.cpp b/hphp/runtime/vm/jit/region-onebc.cpp
similarity index 97%
rename from hphp/runtime/vm/jit/region_onebc.cpp
rename to hphp/runtime/vm/jit/region-onebc.cpp
index 13afc34c7..b84d693d4 100644
--- a/hphp/runtime/vm/jit/region_onebc.cpp
+++ b/hphp/runtime/vm/jit/region-onebc.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/base/memory/smart_containers.h"
 
 namespace HPHP { namespace JIT {
diff --git a/hphp/runtime/vm/jit/region_selection.cpp b/hphp/runtime/vm/jit/region-selection.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/region_selection.cpp
rename to hphp/runtime/vm/jit/region-selection.cpp
index ea3db1f88..ba9695e19 100644
--- a/hphp/runtime/vm/jit/region_selection.cpp
+++ b/hphp/runtime/vm/jit/region-selection.cpp
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 
 #include <algorithm>
 #include <boost/range/adaptors.hpp>
diff --git a/hphp/runtime/vm/jit/region_selection.h b/hphp/runtime/vm/jit/region-selection.h
similarity index 100%
rename from hphp/runtime/vm/jit/region_selection.h
rename to hphp/runtime/vm/jit/region-selection.h
diff --git a/hphp/runtime/vm/jit/simplifier.cpp b/hphp/runtime/vm/jit/simplifier.cpp
index 170ff3246..d4b847e02 100644
--- a/hphp/runtime/vm/jit/simplifier.cpp
+++ b/hphp/runtime/vm/jit/simplifier.cpp
@@ -21,7 +21,7 @@
 
 #include "hphp/runtime/base/memory/smart_containers.h"
 #include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/runtime.h"
 
diff --git a/hphp/runtime/vm/jit/ssatmp.h b/hphp/runtime/vm/jit/ssa-tmp.h
similarity index 100%
rename from hphp/runtime/vm/jit/ssatmp.h
rename to hphp/runtime/vm/jit/ssa-tmp.h
diff --git a/hphp/runtime/vm/jit/state_vector.h b/hphp/runtime/vm/jit/state-vector.h
similarity index 98%
rename from hphp/runtime/vm/jit/state_vector.h
rename to hphp/runtime/vm/jit/state-vector.h
index cf3fe70d5..0ba08d477 100644
--- a/hphp/runtime/vm/jit/state_vector.h
+++ b/hphp/runtime/vm/jit/state-vector.h
@@ -20,7 +20,7 @@
 #include <type_traits>
 
 #include "hphp/runtime/base/memory/smart_containers.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/targetcache.cpp b/hphp/runtime/vm/jit/target-cache.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/targetcache.cpp
rename to hphp/runtime/vm/jit/target-cache.cpp
index 2815005d0..d73601920 100644
--- a/hphp/runtime/vm/jit/targetcache.cpp
+++ b/hphp/runtime/vm/jit/target-cache.cpp
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/types.h"
@@ -92,7 +92,7 @@ undefinedError(const char* msg, const char* name) {
   raise_error(msg, name);
 }
 
-// Targetcache memory. See the comment in targetcache.h
+// Targetcache memory. See the comment in target-cache.h
 __thread void* tl_targetCaches = nullptr;
 __thread HphpArray* s_constants = nullptr;
 
diff --git a/hphp/runtime/vm/jit/targetcache.h b/hphp/runtime/vm/jit/target-cache.h
similarity index 100%
rename from hphp/runtime/vm/jit/targetcache.h
rename to hphp/runtime/vm/jit/target-cache.h
diff --git a/hphp/runtime/vm/jit/tracebuilder.cpp b/hphp/runtime/vm/jit/trace-builder.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/tracebuilder.cpp
rename to hphp/runtime/vm/jit/trace-builder.cpp
index 01561ab09..9a8664d8d 100644
--- a/hphp/runtime/vm/jit/tracebuilder.cpp
+++ b/hphp/runtime/vm/jit/trace-builder.cpp
@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/vm/jit/tracebuilder.h"
+#include "hphp/runtime/vm/jit/trace-builder.h"
 
 #include "folly/ScopeGuard.h"
 
 #include "hphp/util/trace.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/tracebuilder.h b/hphp/runtime/vm/jit/trace-builder.h
similarity index 99%
rename from hphp/runtime/vm/jit/tracebuilder.h
rename to hphp/runtime/vm/jit/trace-builder.h
index 4a5a01870..846575461 100644
--- a/hphp/runtime/vm/jit/tracebuilder.h
+++ b/hphp/runtime/vm/jit/trace-builder.h
@@ -23,10 +23,10 @@
 #include "folly/Optional.h"
 
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
 #include "hphp/runtime/vm/jit/cse.h"
 #include "hphp/runtime/vm/jit/simplifier.h"
-#include "hphp/runtime/vm/jit/state_vector.h"
+#include "hphp/runtime/vm/jit/state-vector.h"
 
 namespace HPHP {  namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/translator-runtime.h b/hphp/runtime/vm/jit/translator-runtime.h
index 25fddd9ec..ff14c5c8e 100644
--- a/hphp/runtime/vm/jit/translator-runtime.h
+++ b/hphp/runtime/vm/jit/translator-runtime.h
@@ -18,7 +18,7 @@
 
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 
 namespace HPHP { namespace Transl {
 
diff --git a/hphp/runtime/vm/jit/translator-x64-helpers.cpp b/hphp/runtime/vm/jit/translator-x64-helpers.cpp
index 1740a2cea..f907c3ec3 100644
--- a/hphp/runtime/vm/jit/translator-x64-helpers.cpp
+++ b/hphp/runtime/vm/jit/translator-x64-helpers.cpp
@@ -15,7 +15,7 @@
 */
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/base/file_repository.h"
 #include "hphp/runtime/vm/event_hook.h"
 #include "hphp/runtime/base/builtin_functions.h"
diff --git a/hphp/runtime/vm/jit/translator-x64.cpp b/hphp/runtime/vm/jit/translator-x64.cpp
index 568cabd41..5e396c6b6 100644
--- a/hphp/runtime/vm/jit/translator-x64.cpp
+++ b/hphp/runtime/vm/jit/translator-x64.cpp
@@ -77,7 +77,7 @@
 #include "hphp/runtime/ext/ext_continuation.h"
 #include "hphp/runtime/ext/ext_function.h"
 #include "hphp/runtime/vm/debug/debug.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/srcdb.h"
 #include "hphp/runtime/vm/jit/x64-util.h"
@@ -89,8 +89,8 @@
 #include "hphp/runtime/vm/type_profile.h"
 #include "hphp/runtime/vm/member_operations.h"
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 
 #include "hphp/runtime/vm/jit/translator-x64-internal.h"
 
diff --git a/hphp/runtime/vm/jit/translator.cpp b/hphp/runtime/vm/jit/translator.cpp
index 8d23154ac..8e7b3578e 100644
--- a/hphp/runtime/vm/jit/translator.cpp
+++ b/hphp/runtime/vm/jit/translator.cpp
@@ -40,10 +40,10 @@
 #include "hphp/runtime/vm/hhbc.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/annotation.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
-#include "hphp/runtime/vm/jit/irfactory.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
+#include "hphp/runtime/vm/jit/ir-factory.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/jit/type.h"
diff --git a/hphp/runtime/vm/jit/translator.h b/hphp/runtime/vm/jit/translator.h
index 42419f461..b3582c72b 100644
--- a/hphp/runtime/vm/jit/translator.h
+++ b/hphp/runtime/vm/jit/translator.h
@@ -33,13 +33,13 @@
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/fixup.h"
-#include "hphp/runtime/vm/jit/region_selection.h"
+#include "hphp/runtime/vm/jit/region-selection.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
 #include "hphp/runtime/vm/jit/srcdb.h"
 #include "hphp/runtime/vm/jit/trans-data.h"
 #include "hphp/runtime/vm/jit/translator-instrs.h"
 #include "hphp/runtime/vm/jit/type.h"
-#include "hphp/runtime/vm/jit/writelease.h"
+#include "hphp/runtime/vm/jit/write-lease.h"
 #include "hphp/runtime/vm/debugger_hook.h"
 #include "hphp/runtime/vm/srckey.h"
 #include "hphp/runtime/base/md5.h"
diff --git a/hphp/runtime/vm/jit/type.cpp b/hphp/runtime/vm/jit/type.cpp
index 6c7e1b38f..787355cc8 100644
--- a/hphp/runtime/vm/jit/type.cpp
+++ b/hphp/runtime/vm/jit/type.cpp
@@ -20,8 +20,8 @@
 
 #include "hphp/util/trace.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
-#include "hphp/runtime/vm/jit/ssatmp.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
+#include "hphp/runtime/vm/jit/ssa-tmp.h"
 #include "hphp/runtime/vm/jit/translator.h"
 
 using namespace HPHP::Transl;
diff --git a/hphp/runtime/vm/jit/unwind-x64.cpp b/hphp/runtime/vm/jit/unwind-x64.cpp
index afb3af6cd..9a2f38579 100644
--- a/hphp/runtime/vm/jit/unwind-x64.cpp
+++ b/hphp/runtime/vm/jit/unwind-x64.cpp
@@ -24,7 +24,7 @@
 
 #include "hphp/runtime/vm/jit/abi-x64.h"
 #include "hphp/runtime/vm/jit/runtime-type.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/base/stats.h"
 #include "hphp/runtime/vm/runtime.h"
diff --git a/hphp/runtime/vm/jit/vectortranslator-internal.h b/hphp/runtime/vm/jit/vector-translator-internal.h
similarity index 100%
rename from hphp/runtime/vm/jit/vectortranslator-internal.h
rename to hphp/runtime/vm/jit/vector-translator-internal.h
diff --git a/hphp/runtime/vm/jit/vectortranslator.cpp b/hphp/runtime/vm/jit/vector-translator.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/vectortranslator.cpp
rename to hphp/runtime/vm/jit/vector-translator.cpp
index 07db8bc97..180e457bd 100644
--- a/hphp/runtime/vm/jit/vectortranslator.cpp
+++ b/hphp/runtime/vm/jit/vector-translator.cpp
@@ -16,14 +16,14 @@
 
 #include "hphp/runtime/base/strings.h"
 #include "hphp/runtime/vm/member_operations.h"
-#include "hphp/runtime/vm/jit/hhbctranslator.h"
+#include "hphp/runtime/vm/jit/hhbc-translator.h"
 #include "hphp/runtime/vm/jit/ir.h"
-#include "hphp/runtime/vm/jit/irinstruction.h"
+#include "hphp/runtime/vm/jit/ir-instruction.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 
 // These files do ugly things with macros so include them last
 #include "hphp/util/assert_throw.h"
-#include "hphp/runtime/vm/jit/vectortranslator-internal.h"
+#include "hphp/runtime/vm/jit/vector-translator-internal.h"
 
 namespace HPHP { namespace JIT {
 
diff --git a/hphp/runtime/vm/jit/writelease.cpp b/hphp/runtime/vm/jit/write-lease.cpp
similarity index 99%
rename from hphp/runtime/vm/jit/writelease.cpp
rename to hphp/runtime/vm/jit/write-lease.cpp
index d0dbd3c07..6809bbc74 100644
--- a/hphp/runtime/vm/jit/writelease.cpp
+++ b/hphp/runtime/vm/jit/write-lease.cpp
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/vm/jit/writelease.h"
+#include "hphp/runtime/vm/jit/write-lease.h"
 #include "hphp/util/timer.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/jit/translator.h"
diff --git a/hphp/runtime/vm/jit/writelease.h b/hphp/runtime/vm/jit/write-lease.h
similarity index 100%
rename from hphp/runtime/vm/jit/writelease.h
rename to hphp/runtime/vm/jit/write-lease.h
diff --git a/hphp/runtime/vm/jit/x64-util.h b/hphp/runtime/vm/jit/x64-util.h
index d66e9402f..a46e8a46f 100644
--- a/hphp/runtime/vm/jit/x64-util.h
+++ b/hphp/runtime/vm/jit/x64-util.h
@@ -20,7 +20,7 @@
 #ifndef USE_GCC_FAST_TLS
 #include <pthread.h>
 #include "hphp/runtime/vm/jit/abi-x64.h"
-#include "hphp/runtime/vm/jit/physreg.h"
+#include "hphp/runtime/vm/jit/phys-reg.h"
 #endif
 #include "hphp/runtime/vm/jit/translator-inline.h"
 
diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp
index 3a50550a3..93d91521b 100644
--- a/hphp/runtime/vm/unit.cpp
+++ b/hphp/runtime/vm/unit.cpp
@@ -33,7 +33,7 @@
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/repo.h"
 #include "hphp/runtime/vm/blob_helper.h"
-#include "hphp/runtime/vm/jit/targetcache.h"
+#include "hphp/runtime/vm/jit/target-cache.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/runtime/vm/jit/translator-x64.h"
 #include "hphp/runtime/vm/verifier/check.h"