diff --git a/gems/cgi/0.5/core.rbs b/gems/cgi/0.5/core.rbs
index 2c16f01e..5b4a8498 100644
--- a/gems/cgi/0.5/core.rbs
+++ b/gems/cgi/0.5/core.rbs
@@ -6,6 +6,10 @@ class CGI
 
   extend CGI::Util
 
+  include CGI::Escape
+
+  extend CGI::Escape
+
   # <!--
   #   rdoc-file=lib/cgi/core.rb
   #   - CGI.new(tag_maker) { block }
@@ -886,7 +890,9 @@ class CGI
     #       # Sat, 01 Jan 2000 00:00:00 GMT
     #
     def rfc1123_date: (Time time) -> String
+  end
 
+  module Escape
     def escape: (String) -> String
     def unescape: (String, ?encoding: Encoding) -> String
 
@@ -899,6 +905,7 @@ class CGI
     def unescapeHTML: (String) -> String
     alias escape_html escapeHTML
     alias unescape_html unescapeHTML
+    alias h escapeHTML
 
     def escapeElement: (String, *String) -> String
                      | (String, Array[String]) -> String
@@ -907,15 +914,12 @@ class CGI
     alias escape_element escapeElement
     alias unescape_element unescapeElement
 
-    # Abbreviated day-of-week names specified by RFC 822
-    RFC822_DAYS: Array[String]
-
-    # Abbreviated month names specified by RFC 822
-    RFC822_MONTHS: Array[String]
-
-    # <!-- rdoc-file=lib/cgi/util.rb -->
+    # <!-- rdoc-file=lib/cgi/escape.rb -->
     # The set of special characters and their escaped values
     #
     TABLE_FOR_ESCAPE_HTML__: Hash[String, String]
   end
+
+  module EscapeExt
+  end
 end
diff --git a/gems/cgi/_reviewers.yaml b/gems/cgi/_reviewers.yaml
new file mode 100644
index 00000000..0b4d3b7e
--- /dev/null
+++ b/gems/cgi/_reviewers.yaml
@@ -0,0 +1,2 @@
+reviewers:
+  - ksss