diff --git a/BUILD b/BUILD
index bc4f4eb9789cae11fa46fbe0f3f0a9578d7a8d5e..83cf3e651a5dbdd0fa331909b2efa16235aed2a2 100644
--- a/BUILD
+++ b/BUILD
@@ -780,12 +780,12 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_http_filters",
     hdrs = [
-        "src/core/ext/filters/http/compress/compress_filter.h",
+        "src/core/ext/filters/http/message_compress/message_compress_filter.h",
         "src/core/ext/filters/http/client/http_client_filter.h",
         "src/core/ext/filters/http/server/http_server_filter.h",
     ],
     srcs = [
-        "src/core/ext/filters/http/compress/compress_filter.c",
+        "src/core/ext/filters/http/message_compress/message_compress_filter.c",
         "src/core/ext/filters/http/client/http_client_filter.c",
         "src/core/ext/filters/http/server/http_server_filter.c",
         "src/core/ext/filters/http/http_filters_plugin.c"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089e028bff5aed2faff422f460fc986a0fd89bed..f79d7154a981a5397783f775e933899d132a1bb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1051,7 +1051,7 @@ add_library(grpc
   src/core/ext/transport/chttp2/transport/writing.c
   src/core/ext/transport/chttp2/alpn/alpn.c
   src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/compress/compress_filter.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
   src/core/ext/filters/http/http_filters_plugin.c
   src/core/ext/filters/http/server/http_server_filter.c
   src/core/lib/http/httpcli_security_connector.c
@@ -1377,7 +1377,7 @@ add_library(grpc_cronet
   src/core/ext/transport/chttp2/transport/writing.c
   src/core/ext/transport/chttp2/alpn/alpn.c
   src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/compress/compress_filter.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
   src/core/ext/filters/http/http_filters_plugin.c
   src/core/ext/filters/http/server/http_server_filter.c
   src/core/ext/filters/client_channel/channel_connectivity.c
@@ -1939,7 +1939,7 @@ add_library(grpc_unsecure
   src/core/ext/transport/chttp2/transport/writing.c
   src/core/ext/transport/chttp2/alpn/alpn.c
   src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/compress/compress_filter.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
   src/core/ext/filters/http/http_filters_plugin.c
   src/core/ext/filters/http/server/http_server_filter.c
   src/core/ext/transport/chttp2/server/chttp2_server.c
@@ -2687,7 +2687,7 @@ add_library(grpc++_cronet
   src/core/ext/transport/chttp2/transport/writing.c
   src/core/ext/transport/chttp2/alpn/alpn.c
   src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/compress/compress_filter.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
   src/core/ext/filters/http/http_filters_plugin.c
   src/core/ext/filters/http/server/http_server_filter.c
   src/core/ext/filters/client_channel/channel_connectivity.c
diff --git a/Makefile b/Makefile
index 035e92f8e40a0b1559fd176e3e83a4769856bea5..f2ee6901cfeeddcdec2b2d29786f8e23f1bfe953 100644
--- a/Makefile
+++ b/Makefile
@@ -2956,7 +2956,7 @@ LIBGRPC_SRC = \
     src/core/ext/transport/chttp2/transport/writing.c \
     src/core/ext/transport/chttp2/alpn/alpn.c \
     src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/compress/compress_filter.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
     src/core/ext/filters/http/http_filters_plugin.c \
     src/core/ext/filters/http/server/http_server_filter.c \
     src/core/lib/http/httpcli_security_connector.c \
@@ -3280,7 +3280,7 @@ LIBGRPC_CRONET_SRC = \
     src/core/ext/transport/chttp2/transport/writing.c \
     src/core/ext/transport/chttp2/alpn/alpn.c \
     src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/compress/compress_filter.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
     src/core/ext/filters/http/http_filters_plugin.c \
     src/core/ext/filters/http/server/http_server_filter.c \
     src/core/ext/filters/client_channel/channel_connectivity.c \
@@ -3813,7 +3813,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/ext/transport/chttp2/transport/writing.c \
     src/core/ext/transport/chttp2/alpn/alpn.c \
     src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/compress/compress_filter.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
     src/core/ext/filters/http/http_filters_plugin.c \
     src/core/ext/filters/http/server/http_server_filter.c \
     src/core/ext/transport/chttp2/server/chttp2_server.c \
@@ -4546,7 +4546,7 @@ LIBGRPC++_CRONET_SRC = \
     src/core/ext/transport/chttp2/transport/writing.c \
     src/core/ext/transport/chttp2/alpn/alpn.c \
     src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/compress/compress_filter.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
     src/core/ext/filters/http/http_filters_plugin.c \
     src/core/ext/filters/http/server/http_server_filter.c \
     src/core/ext/filters/client_channel/channel_connectivity.c \
diff --git a/binding.gyp b/binding.gyp
index ad9d7c8f28ec9562bf47dd4682202a0693f4e255..21cd56e68440d6a852c49511c012ede8b329fca4 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -792,7 +792,7 @@
         'src/core/ext/transport/chttp2/transport/writing.c',
         'src/core/ext/transport/chttp2/alpn/alpn.c',
         'src/core/ext/filters/http/client/http_client_filter.c',
-        'src/core/ext/filters/http/compress/compress_filter.c',
+        'src/core/ext/filters/http/message_compress/message_compress_filter.c',
         'src/core/ext/filters/http/http_filters_plugin.c',
         'src/core/ext/filters/http/server/http_server_filter.c',
         'src/core/lib/http/httpcli_security_connector.c',
diff --git a/build.yaml b/build.yaml
index 1df62654a4cc2a31621742bd6ff1915099980266..2d52b38fbf23f9a575076f78c382aa5584c366f3 100644
--- a/build.yaml
+++ b/build.yaml
@@ -472,11 +472,11 @@ filegroups:
 - name: grpc_http_filters
   headers:
   - src/core/ext/filters/http/client/http_client_filter.h
-  - src/core/ext/filters/http/compress/compress_filter.h
+  - src/core/ext/filters/http/message_compress/message_compress_filter.h
   - src/core/ext/filters/http/server/http_server_filter.h
   src:
   - src/core/ext/filters/http/client/http_client_filter.c
-  - src/core/ext/filters/http/compress/compress_filter.c
+  - src/core/ext/filters/http/message_compress/message_compress_filter.c
   - src/core/ext/filters/http/http_filters_plugin.c
   - src/core/ext/filters/http/server/http_server_filter.c
   plugin: grpc_http_filters
diff --git a/config.m4 b/config.m4
index 85593afd3c527de71a755fe85da62ebeda8974ee..985de0856282e8463663296ccdd167cfb3ebc07a 100644
--- a/config.m4
+++ b/config.m4
@@ -226,7 +226,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/transport/chttp2/transport/writing.c \
     src/core/ext/transport/chttp2/alpn/alpn.c \
     src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/compress/compress_filter.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
     src/core/ext/filters/http/http_filters_plugin.c \
     src/core/ext/filters/http/server/http_server_filter.c \
     src/core/lib/http/httpcli_security_connector.c \
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 9cd92835ac5dcb8b36e6187e6a74bd5a93406a7f..b79a759438e330f4d93eb6ff060f3474ab78b45e 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -381,7 +381,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/varint.h',
                       'src/core/ext/transport/chttp2/alpn/alpn.h',
                       'src/core/ext/filters/http/client/http_client_filter.h',
-                      'src/core/ext/filters/http/compress/compress_filter.h',
+                      'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                       'src/core/ext/filters/http/server/http_server_filter.h',
                       'src/core/lib/security/context/security_context.h',
                       'src/core/lib/security/credentials/composite/composite_credentials.h',
@@ -601,7 +601,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/writing.c',
                       'src/core/ext/transport/chttp2/alpn/alpn.c',
                       'src/core/ext/filters/http/client/http_client_filter.c',
-                      'src/core/ext/filters/http/compress/compress_filter.c',
+                      'src/core/ext/filters/http/message_compress/message_compress_filter.c',
                       'src/core/ext/filters/http/http_filters_plugin.c',
                       'src/core/ext/filters/http/server/http_server_filter.c',
                       'src/core/lib/http/httpcli_security_connector.c',
@@ -832,7 +832,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/transport/varint.h',
                               'src/core/ext/transport/chttp2/alpn/alpn.h',
                               'src/core/ext/filters/http/client/http_client_filter.h',
-                              'src/core/ext/filters/http/compress/compress_filter.h',
+                              'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                               'src/core/ext/filters/http/server/http_server_filter.h',
                               'src/core/lib/security/context/security_context.h',
                               'src/core/lib/security/credentials/composite/composite_credentials.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 0e4a3d6fecd84df23334ed07bf72f8ebac3076ae..2a6563f87936feb4f4c3e3b2839b04cb1ed1a39c 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -297,7 +297,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/transport/chttp2/transport/varint.h )
   s.files += %w( src/core/ext/transport/chttp2/alpn/alpn.h )
   s.files += %w( src/core/ext/filters/http/client/http_client_filter.h )
-  s.files += %w( src/core/ext/filters/http/compress/compress_filter.h )
+  s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.h )
   s.files += %w( src/core/ext/filters/http/server/http_server_filter.h )
   s.files += %w( src/core/lib/security/context/security_context.h )
   s.files += %w( src/core/lib/security/credentials/composite/composite_credentials.h )
@@ -517,7 +517,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/transport/chttp2/transport/writing.c )
   s.files += %w( src/core/ext/transport/chttp2/alpn/alpn.c )
   s.files += %w( src/core/ext/filters/http/client/http_client_filter.c )
-  s.files += %w( src/core/ext/filters/http/compress/compress_filter.c )
+  s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.c )
   s.files += %w( src/core/ext/filters/http/http_filters_plugin.c )
   s.files += %w( src/core/ext/filters/http/server/http_server_filter.c )
   s.files += %w( src/core/lib/http/httpcli_security_connector.c )
diff --git a/package.xml b/package.xml
index 8cda68a26663c4e7091a122331db0071e0a51ce0..0771774b4c108015c8f329e2691866e9f489e851 100644
--- a/package.xml
+++ b/package.xml
@@ -306,7 +306,7 @@
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/alpn/alpn.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/http/client/http_client_filter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/http/compress/compress_filter.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/context/security_context.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/security/credentials/composite/composite_credentials.h" role="src" />
@@ -526,7 +526,7 @@
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/writing.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/alpn/alpn.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/http/client/http_client_filter.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/http/compress/compress_filter.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/http/http_filters_plugin.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.c" role="src" />
diff --git a/src/core/ext/filters/http/http_filters_plugin.c b/src/core/ext/filters/http/http_filters_plugin.c
index a6e35bc181a9cded497e687ede940450fb517004..825c21cb6a61a643e6e4bbb749204756aa64bc32 100644
--- a/src/core/ext/filters/http/http_filters_plugin.c
+++ b/src/core/ext/filters/http/http_filters_plugin.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/surface/channel_init.h"
diff --git a/src/core/ext/filters/http/compress/compress_filter.c b/src/core/ext/filters/http/message_compress/message_compress_filter.c
similarity index 99%
rename from src/core/ext/filters/http/compress/compress_filter.c
rename to src/core/ext/filters/http/message_compress/message_compress_filter.c
index ab6c94a1539284bbaf901af8e325da74cad088a0..f110e7beb63646eb277967b0de246b7e4585c283 100644
--- a/src/core/ext/filters/http/compress/compress_filter.c
+++ b/src/core/ext/filters/http/message_compress/message_compress_filter.c
@@ -39,7 +39,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/compression/algorithm_metadata.h"
 #include "src/core/lib/compression/message_compress.h"
diff --git a/src/core/ext/filters/http/compress/compress_filter.h b/src/core/ext/filters/http/message_compress/message_compress_filter.h
similarity index 100%
rename from src/core/ext/filters/http/compress/compress_filter.h
rename to src/core/ext/filters/http/message_compress/message_compress_filter.h
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index c858dc9e1f558a3f7ce00258890b6a24439adb21..afaf2acaa4d6efd56e5ffbfad29b0d17658eab87 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -220,7 +220,7 @@ CORE_SOURCE_FILES = [
   'src/core/ext/transport/chttp2/transport/writing.c',
   'src/core/ext/transport/chttp2/alpn/alpn.c',
   'src/core/ext/filters/http/client/http_client_filter.c',
-  'src/core/ext/filters/http/compress/compress_filter.c',
+  'src/core/ext/filters/http/message_compress/message_compress_filter.c',
   'src/core/ext/filters/http/http_filters_plugin.c',
   'src/core/ext/filters/http/server/http_server_filter.c',
   'src/core/lib/http/httpcli_security_connector.c',
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 5fc0e4ea735883e7c3fed76df8354bfd6c8534d8..c59b544902f8a8fbb7d663be91102d8b1a4bfa80 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -47,7 +47,7 @@
 #include <grpc/support/useful.h>
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/connected_channel.h"
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c
index 24ed048e7d4be1c31973c9d6036837bea89092f6..1cb4e70727b48c53eeac42627c590213c0d218f0 100644
--- a/test/core/end2end/fixtures/h2_sockpair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
@@ -42,7 +42,7 @@
 #include <grpc/support/useful.h>
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/connected_channel.h"
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index fee30946c4354345ea5e609b892bccb091e27ff9..9cd93c234a22ba1c66ac37a7ce892354c160ad31 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
@@ -42,7 +42,7 @@
 #include <grpc/support/useful.h>
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/connected_channel.h"
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index ae6041733c25d30bc09d214122a8e4342b45dbcf..7221cf5512a4e3d0d92393ff7c62b9989c707e6d 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -48,7 +48,7 @@ extern "C" {
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/deadline/deadline_filter.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/ext/filters/load_reporting/load_reporting_filter.h"
 #include "src/core/ext/filters/message_size/message_size_filter.h"
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8bc5896e88cc6b86f226b50c79bc285ad32af28a..ca38e2fe0f109d428c8c7f0fcb2ad597167f1788 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -958,8 +958,8 @@ src/core/ext/filters/deadline/deadline_filter.c \
 src/core/ext/filters/deadline/deadline_filter.h \
 src/core/ext/filters/http/client/http_client_filter.c \
 src/core/ext/filters/http/client/http_client_filter.h \
-src/core/ext/filters/http/compress/compress_filter.c \
-src/core/ext/filters/http/compress/compress_filter.h \
+src/core/ext/filters/http/message_compress/message_compress_filter.c \
+src/core/ext/filters/http/message_compress/message_compress_filter.h \
 src/core/ext/filters/http/http_filters_plugin.c \
 src/core/ext/filters/http/server/http_server_filter.c \
 src/core/ext/filters/http/server/http_server_filter.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6cf4494b12f0ec6b268a46377b6e703e8494f464..63d6419146fc4540d04ddac6f5735d92fb9eeb76 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8013,7 +8013,7 @@
     ], 
     "headers": [
       "src/core/ext/filters/http/client/http_client_filter.h", 
-      "src/core/ext/filters/http/compress/compress_filter.h", 
+      "src/core/ext/filters/http/message_compress/message_compress_filter.h", 
       "src/core/ext/filters/http/server/http_server_filter.h"
     ], 
     "is_filegroup": true, 
@@ -8022,8 +8022,8 @@
     "src": [
       "src/core/ext/filters/http/client/http_client_filter.c", 
       "src/core/ext/filters/http/client/http_client_filter.h", 
-      "src/core/ext/filters/http/compress/compress_filter.c", 
-      "src/core/ext/filters/http/compress/compress_filter.h", 
+      "src/core/ext/filters/http/message_compress/message_compress_filter.c", 
+      "src/core/ext/filters/http/message_compress/message_compress_filter.h", 
       "src/core/ext/filters/http/http_filters_plugin.c", 
       "src/core/ext/filters/http/server/http_server_filter.c", 
       "src/core/ext/filters/http/server/http_server_filter.h"