diff --git a/pecan/__init__.py b/pecan/__init__.py
index b6c7a8a..521d7ff 100644
--- a/pecan/__init__.py
+++ b/pecan/__init__.py
@@ -8,7 +8,7 @@ from middleware.debug import DebugMiddleware
 from middleware.errordocument import ErrorDocumentMiddleware
 from middleware.logger import TransLogger
 from middleware.recursive import RecursiveMiddleware
-from middleware.static import SharedDataMiddleware
+from middleware.static import StaticFileMiddleware
 
 from configuration import set_config
 from configuration import _runtime_conf as conf
@@ -48,9 +48,9 @@ def make_app(root, static_root=None, debug=False, errorcfg={},
     if debug:
         app = DebugMiddleware(app)
 
-    # Support for serving static files (for development convenience)
-    if static_root:
-        app = SharedDataMiddleware(app, static_root)
+        # Support for serving static files (for development convenience)
+        if static_root:
+            app = StaticFileMiddleware(app, static_root)
 
     # Support for simple Apache-style logs
     if isinstance(logging, dict) or logging == True:
diff --git a/pecan/middleware/static.py b/pecan/middleware/static.py
index 78b58c6..c68bce7 100644
--- a/pecan/middleware/static.py
+++ b/pecan/middleware/static.py
@@ -88,7 +88,7 @@ def http_date(timestamp=None):
     return _dump_date(timestamp, ' ')
 
 
-class SharedDataMiddleware(object):
+class StaticFileMiddleware(object):
     """A WSGI middleware that provides static content for development
     environments.
 
diff --git a/pecan/tests/middleware/test_static.py b/pecan/tests/middleware/test_static.py
index ddf1b2b..eaddf73 100644
--- a/pecan/tests/middleware/test_static.py
+++ b/pecan/tests/middleware/test_static.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from pecan.middleware.static import (SharedDataMiddleware, FileWrapper,
+from pecan.middleware.static import (StaticFileMiddleware, FileWrapper,
                                     _dump_date)
 
 import os
@@ -13,7 +13,7 @@ class TestStaticFileMiddleware(TestCase):
             start_response('200 OK', response_headers)
             return ['Hello world!\n']
 
-        self.app = SharedDataMiddleware(
+        self.app = StaticFileMiddleware(
             app, os.path.dirname(__file__)
         )