diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
index 01870b13ef6..f23c99692ae 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
@@ -65,5 +65,5 @@ Currently there are very few HTTP/2 configuration properties and the default val
 |=======================================================================
 |Property |Description
 |jetty.http2.maxConcurrentStreams |The maximum number of concurrently open streams allowed on a single HTTP/2 connection (default 1024). Larger values increase parallelism but cost a memory commitment.
-|jetty.http2.initialStreamSendWindow |The initial flow control window size for a new stream (default 65535). Larger values may allow greater throughput but also risk head of line blocking if TCP/IP flow control is triggered.
+|jetty.http2.initialStreamRecvWindow |The initial receive flow control window size for a new stream (default 65535). Larger values may allow greater throughput but also risk head of line blocking if TCP/IP flow control is triggered.
 |=======================================================================
diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml
index b23f25b41f7..064a204cd42 100644
--- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml
+++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml
@@ -10,7 +10,7 @@
       <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
         <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
         <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
-        <Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
+        <Set name="initialStreamRecvWindow"><Property name="jetty.http2.initialStreamRecvWindow" deprecated="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
       </New>
     </Arg>
   </Call>
@@ -23,4 +23,3 @@
   </Ref>
 
 </Configure>
-
diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml
index ccd3af14048..8e53064349b 100644
--- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml
+++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml
@@ -10,9 +10,8 @@
       <New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory">
         <Arg name="config"><Ref refid="httpConfig"/></Arg>
         <Set name="maxConcurrentStreams"><Property name="jetty.http2c.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
-        <Set name="initialStreamSendWindow"><Property name="jetty.http2c.initialStreamSendWindow" default="65535"/></Set>
+        <Set name="initialStreamRecvWindow"><Property name="jetty.http2c.initialStreamRecvWindow" deprecated="jetty.http2c.initialStreamSendWindow" default="65535"/></Set>
       </New>
     </Arg>
   </Call>
 </Configure>
-
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-http2/http2-server/src/main/config/modules/http2.mod
index 585c1fa5ee6..6b2b0cdca21 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod
@@ -16,5 +16,5 @@ etc/jetty-http2.xml
 ## Max number of concurrent streams per connection
 # jetty.http2.maxConcurrentStreams=1024
 
-## Initial stream send (server to client) window
-# jetty.http2.initialStreamSendWindow=65535
+## Initial stream receive window (client to server)
+# jetty.http2.initialStreamRecvWindow=65535
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
index 1c78016598f..b6a3eab676c 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
@@ -18,5 +18,5 @@ etc/jetty-http2c.xml
 ## Max number of concurrent streams per connection
 # jetty.http2c.maxConcurrentStreams=1024
 
-## Initial stream send (server to client) window
-# jetty.http2c.initialStreamSendWindow=65535
+## Initial stream receive window (client to server)
+# jetty.http2c.initialStreamRecvWindow=65535
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod
index 585c1fa5ee6..6b2b0cdca21 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod
@@ -16,5 +16,5 @@ etc/jetty-http2.xml
 ## Max number of concurrent streams per connection
 # jetty.http2.maxConcurrentStreams=1024
 
-## Initial stream send (server to client) window
-# jetty.http2.initialStreamSendWindow=65535
+## Initial stream receive window (client to server)
+# jetty.http2.initialStreamRecvWindow=65535
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2c.mod b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
index 15883cab2ce..3792194219a 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
@@ -18,5 +18,5 @@ etc/jetty-http2c.xml
 ## Max number of concurrent streams per connection
 # jetty.http2.maxConcurrentStreams=1024
 
-## Initial stream send (server to client) window
-# jetty.http2.initialStreamSendWindow=65535
+## Initial stream receive window (client to server)
+# jetty.http2.initialStreamRecvWindow=65535