diff --git a/node.gyp b/node.gyp
index 3c4596a4e5..a70a3ab194 100755
--- a/node.gyp
+++ b/node.gyp
@@ -182,7 +182,7 @@
         'src/node_contextify.cc',
         'src/node_debug_options.cc',
         'src/node_file.cc',
-        'src/node-http2-core.cc',
+        'src/node_http2_core.cc',
         'src/node_http2.cc',
         'src/node_http_parser.cc',
         'src/node_main.cc',
@@ -226,8 +226,8 @@
         'src/handle_wrap.h',
         'src/js_stream.h',
         'src/node.h',
-        'src/node-http2-core.h',
-        'src/node-http2-core-inl.h',
+        'src/node_http2_core.h',
+        'src/node_http2_core-inl.h',
         'src/node_buffer.h',
         'src/node_constants.h',
         'src/node_debug_options.h',
diff --git a/src/node_http2.cc b/src/node_http2.cc
index dd4be31ac3..01102d8c18 100755
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -2,8 +2,8 @@
 #include "node_buffer.h"
 #include "nghttp2/nghttp2.h"
 #include "node_http2.h"
-#include "node-http2-core.h"
-#include "node-http2-core-inl.h"
+#include "node_http2_core.h"
+#include "node_http2_core-inl.h"
 #include "stream_base.h"
 #include "stream_base-inl.h"
 #include "string_bytes.h"
diff --git a/src/node_http2.h b/src/node_http2.h
index e7ac4b35c8..dcf3837b09 100755
--- a/src/node_http2.h
+++ b/src/node_http2.h
@@ -7,8 +7,8 @@
 #include "nghttp2/nghttp2.h"
 #include "uv.h"
 
-#include "node-http2-core.h"
-#include "node-http2-core-inl.h"
+#include "node_http2_core.h"
+#include "node_http2_core-inl.h"
 #include "env.h"
 #include "env-inl.h"
 #include "node_crypto_bio.h"
diff --git a/src/node-http2-core-inl.h b/src/node_http2_core-inl.h
similarity index 99%
rename from src/node-http2-core-inl.h
rename to src/node_http2_core-inl.h
index 4e1d9cf6c1..d926cb9de8 100755
--- a/src/node-http2-core-inl.h
+++ b/src/node_http2_core-inl.h
@@ -3,7 +3,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "node-http2-core.h"
+#include "node_http2_core.h"
 #include "node_internals.h"  // arraysize
 #include "util.h"
 #include "util-inl.h"
diff --git a/src/node-http2-core.cc b/src/node_http2_core.cc
similarity index 99%
rename from src/node-http2-core.cc
rename to src/node_http2_core.cc
index 1508ec585b..0bb66f7070 100644
--- a/src/node-http2-core.cc
+++ b/src/node_http2_core.cc
@@ -1,5 +1,5 @@
-#include "node-http2-core.h"
-#include "node-http2-core-inl.h"
+#include "node_http2_core.h"
+#include "node_http2_core-inl.h"
 
 namespace node {
 namespace http2 {
diff --git a/src/node-http2-core.h b/src/node_http2_core.h
similarity index 100%
rename from src/node-http2-core.h
rename to src/node_http2_core.h