diff --git a/pillar/__init__.py b/pillar/__init__.py
index 2e136a34..a1b2c2e6 100644
--- a/pillar/__init__.py
+++ b/pillar/__init__.py
@@ -280,7 +280,7 @@ class PillarServer(Eve):
                                                ext.static_path)
 
     def register_static_file_endpoint(self, url_prefix, endpoint_name, static_folder):
-        from pillar.web.static import PillarStaticFile
+        from pillar.web.staticfile import PillarStaticFile
 
         view_func = PillarStaticFile.as_view(endpoint_name, static_folder=static_folder)
         self.add_url_rule('%s/<path:filename>' % url_prefix, view_func=view_func)
diff --git a/pillar/web/static.py b/pillar/web/staticfile.py
similarity index 100%
rename from pillar/web/static.py
rename to pillar/web/staticfile.py