diff --git a/scrapy/trunk/docs/proposed/tutorial.rst b/scrapy/trunk/docs/proposed/tutorial.rst
index aa303e576..376446d5d 100644
--- a/scrapy/trunk/docs/proposed/tutorial.rst
+++ b/scrapy/trunk/docs/proposed/tutorial.rst
@@ -129,7 +129,7 @@ The ``crawl dmoz.org`` subcommand runs the spider for the ``dmoz.org`` domain, y
 
    [-] Log opened.
    [dmoz] INFO: Enabled extensions: TelnetConsole, WebConsole
-   [dmoz] INFO: Enabled downloader middlewares: ErrorPagesMiddleware, CookiesMiddleware, HttpAuthMiddleware, UserAgentMiddleware, RetryMiddleware, CommonMiddleware, RedirectMiddleware, CompressionMiddleware
+   [dmoz] INFO: Enabled downloader middlewares: ErrorPagesMiddleware, CookiesMiddleware, HttpAuthMiddleware, UserAgentMiddleware, RetryMiddleware, CommonMiddleware, RedirectMiddleware, HTTPCompressionMiddleware
    [dmoz] INFO: Enabled spider middlewares: OffsiteMiddleware, RefererMiddleware, UrlLengthMiddleware, DepthMiddleware, UrlFilterMiddleware
    [dmoz] INFO: Enabled item pipelines: 
    [-] scrapy.management.web.WebConsole starting on 60738
diff --git a/scrapy/trunk/docs/ref/settings.rst b/scrapy/trunk/docs/ref/settings.rst
index 4439a3bab..744b80c07 100644
--- a/scrapy/trunk/docs/ref/settings.rst
+++ b/scrapy/trunk/docs/ref/settings.rst
@@ -296,7 +296,7 @@ Default::
         'scrapy.contrib.downloadermiddleware.retry.RetryMiddleware',
         'scrapy.contrib.downloadermiddleware.common.CommonMiddleware',
         'scrapy.contrib.downloadermiddleware.redirect.RedirectMiddleware',
-        'scrapy.contrib.downloadermiddleware.compression.CompressionMiddleware',
+        'scrapy.contrib.downloadermiddleware.http_compression.HTTPCompressionMiddleware',
         'scrapy.contrib.downloadermiddleware.debug.CrawlDebug',
         'scrapy.contrib.downloadermiddleware.stats.DownloaderStats',
         'scrapy.contrib.downloadermiddleware.cache.CacheMiddleware',
diff --git a/scrapy/trunk/examples/contrib_exp/googledir/googledir/settings.py b/scrapy/trunk/examples/contrib_exp/googledir/googledir/settings.py
index 32153f077..ac7d7efe3 100644
--- a/scrapy/trunk/examples/contrib_exp/googledir/googledir/settings.py
+++ b/scrapy/trunk/examples/contrib_exp/googledir/googledir/settings.py
@@ -61,7 +61,7 @@ DOWNLOADER_MIDDLEWARES = (
     'scrapy.contrib.downloadermiddleware.retry.RetryMiddleware',
     'scrapy.contrib.downloadermiddleware.common.CommonMiddleware',
     'scrapy.contrib.downloadermiddleware.redirect.RedirectMiddleware',
-    'scrapy.contrib.downloadermiddleware.compression.CompressionMiddleware',
+    'scrapy.contrib.downloadermiddleware.http_compression.HTTPCompressionMiddleware',
     'scrapy.contrib.downloadermiddleware.debug.CrawlDebug',
     'scrapy.contrib.downloadermiddleware.cache.CacheMiddleware',
     # Downloader side
diff --git a/scrapy/trunk/examples/googledir/googledir/settings.py b/scrapy/trunk/examples/googledir/googledir/settings.py
index 32153f077..ac7d7efe3 100644
--- a/scrapy/trunk/examples/googledir/googledir/settings.py
+++ b/scrapy/trunk/examples/googledir/googledir/settings.py
@@ -61,7 +61,7 @@ DOWNLOADER_MIDDLEWARES = (
     'scrapy.contrib.downloadermiddleware.retry.RetryMiddleware',
     'scrapy.contrib.downloadermiddleware.common.CommonMiddleware',
     'scrapy.contrib.downloadermiddleware.redirect.RedirectMiddleware',
-    'scrapy.contrib.downloadermiddleware.compression.CompressionMiddleware',
+    'scrapy.contrib.downloadermiddleware.http_compression.HTTPCompressionMiddleware',
     'scrapy.contrib.downloadermiddleware.debug.CrawlDebug',
     'scrapy.contrib.downloadermiddleware.cache.CacheMiddleware',
     # Downloader side
diff --git a/scrapy/trunk/scrapy/conf/default_settings.py b/scrapy/trunk/scrapy/conf/default_settings.py
index 85a6c5ed5..e866a682f 100644
--- a/scrapy/trunk/scrapy/conf/default_settings.py
+++ b/scrapy/trunk/scrapy/conf/default_settings.py
@@ -67,7 +67,7 @@ DOWNLOADER_MIDDLEWARES = [
     'scrapy.contrib.downloadermiddleware.retry.RetryMiddleware',
     'scrapy.contrib.downloadermiddleware.common.CommonMiddleware',
     'scrapy.contrib.downloadermiddleware.redirect.RedirectMiddleware',
-    'scrapy.contrib.downloadermiddleware.compression.CompressionMiddleware',
+    'scrapy.contrib.downloadermiddleware.http_compression.HTTPCompressionMiddleware',
     'scrapy.contrib.downloadermiddleware.debug.CrawlDebug',
     'scrapy.contrib.downloadermiddleware.stats.DownloaderStats',
     'scrapy.contrib.downloadermiddleware.cache.CacheMiddleware',
diff --git a/scrapy/trunk/scrapy/contrib/downloadermiddleware/compression.py b/scrapy/trunk/scrapy/contrib/downloadermiddleware/http_compression.py
similarity index 97%
rename from scrapy/trunk/scrapy/contrib/downloadermiddleware/compression.py
rename to scrapy/trunk/scrapy/contrib/downloadermiddleware/http_compression.py
index 74cd70c8d..418b68aad 100644
--- a/scrapy/trunk/scrapy/contrib/downloadermiddleware/compression.py
+++ b/scrapy/trunk/scrapy/contrib/downloadermiddleware/http_compression.py
@@ -5,7 +5,7 @@ from cStringIO import StringIO
 from scrapy.http import Response
 
 
-class CompressionMiddleware(object):
+class HTTPCompressionMiddleware(object):
     """This middleware allows compressed (gzip, deflate) traffic to be
     sent/received from web sites"""
 
diff --git a/scrapy/trunk/scrapy/contrib_exp/downloadermiddleware/decompression.py b/scrapy/trunk/scrapy/contrib_exp/downloadermiddleware/decompression.py
index 7f1f854ba..66b137a1f 100644
--- a/scrapy/trunk/scrapy/contrib_exp/downloadermiddleware/decompression.py
+++ b/scrapy/trunk/scrapy/contrib_exp/downloadermiddleware/decompression.py
@@ -1,8 +1,5 @@
 """ This module implements the DecompressionMiddleware which tries to recognise
 and extract the potentially compressed responses that may arrive. 
-
-NOTE: This middleware needs a better name to avoid confusiong it with the
-CompressinMiddleware (in contrib.downloadermiddleware.compression).
 """
 
 import zipfile
diff --git a/scrapy/trunk/scrapy/templates/project/module/settings.py b/scrapy/trunk/scrapy/templates/project/module/settings.py
index 3940c42e6..70d3c48a6 100644
--- a/scrapy/trunk/scrapy/templates/project/module/settings.py
+++ b/scrapy/trunk/scrapy/templates/project/module/settings.py
@@ -61,7 +61,7 @@ DOWNLOADER_MIDDLEWARES = (
     'scrapy.contrib.downloadermiddleware.retry.RetryMiddleware',
     'scrapy.contrib.downloadermiddleware.common.CommonMiddleware',
     'scrapy.contrib.downloadermiddleware.redirect.RedirectMiddleware',
-    'scrapy.contrib.downloadermiddleware.compression.CompressionMiddleware',
+    'scrapy.contrib.downloadermiddleware.http_compression.HTTPCompressionMiddleware',
     'scrapy.contrib.downloadermiddleware.debug.CrawlDebug',
     'scrapy.contrib.downloadermiddleware.cache.CacheMiddleware',
     # Downloader side