diff --git a/src/env-inl.h b/src/env-inl.h
index 1aa62fc18ded52..6202e50548a3ce 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -482,12 +482,12 @@ inline void Environment::set_http_parser_buffer_in_use(bool in_use) {
   http_parser_buffer_in_use_ = in_use;
 }
 
-inline http2::http2_state* Environment::http2_state() const {
+inline http2::Http2State* Environment::http2_state() const {
   return http2_state_.get();
 }
 
 inline void Environment::set_http2_state(
-    std::unique_ptr<http2::http2_state> buffer) {
+    std::unique_ptr<http2::Http2State> buffer) {
   CHECK(!http2_state_);  // Should be set only once.
   http2_state_ = std::move(buffer);
 }
diff --git a/src/env.h b/src/env.h
index 252151028164d2..c0d79883d0ff1c 100644
--- a/src/env.h
+++ b/src/env.h
@@ -643,8 +643,8 @@ class Environment {
   inline bool http_parser_buffer_in_use() const;
   inline void set_http_parser_buffer_in_use(bool in_use);
 
-  inline http2::http2_state* http2_state() const;
-  inline void set_http2_state(std::unique_ptr<http2::http2_state> state);
+  inline http2::Http2State* http2_state() const;
+  inline void set_http2_state(std::unique_ptr<http2::Http2State> state);
 
   inline AliasedBuffer<double, v8::Float64Array>* fs_stats_field_array();
 
@@ -831,7 +831,7 @@ class Environment {
 
   char* http_parser_buffer_;
   bool http_parser_buffer_in_use_ = false;
-  std::unique_ptr<http2::http2_state> http2_state_;
+  std::unique_ptr<http2::Http2State> http2_state_;
 
   AliasedBuffer<double, v8::Float64Array> fs_stats_field_array_;
 
diff --git a/src/node_http2.cc b/src/node_http2.cc
index 3563013da3e089..94f774e2d3506d 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -2650,7 +2650,7 @@ void Initialize(Local<Object> target,
   Isolate* isolate = env->isolate();
   HandleScope scope(isolate);
 
-  std::unique_ptr<http2_state> state(new http2_state(isolate));
+  std::unique_ptr<Http2State> state(new Http2State(isolate));
 
 #define SET_STATE_TYPEDARRAY(name, field)             \
   target->Set(context,                                \
diff --git a/src/node_http2_state.h b/src/node_http2_state.h
index ed88f068a04b16..64a0942f7ffa67 100644
--- a/src/node_http2_state.h
+++ b/src/node_http2_state.h
@@ -84,9 +84,9 @@ namespace http2 {
     IDX_SESSION_STATS_COUNT
   };
 
-class http2_state {
+class Http2State {
  public:
-  explicit http2_state(v8::Isolate* isolate) :
+  explicit Http2State(v8::Isolate* isolate) :
     root_buffer(
       isolate,
       sizeof(http2_state_internal)),