diff --git a/ietf/settings.py b/ietf/settings.py
index e0e6e98bb..0aaf13ca0 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -121,7 +121,7 @@ COMPONENT_ROOT = STATIC_ROOT
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'ietf.utils.storage.CdnStorageFinder',
+    'ietf.utils.bower_storage.BowerStorageFinder',
 )
 
 
diff --git a/ietf/storage.py b/ietf/utils/bower_storage.py
similarity index 58%
rename from ietf/storage.py
rename to ietf/utils/bower_storage.py
index 3ce3b18ab..3a06ae03e 100644
--- a/ietf/storage.py
+++ b/ietf/utils/bower_storage.py
@@ -3,5 +3,7 @@ from django.contrib.staticfiles.finders import BaseStorageFinder
 from django.conf import settings
 
 if settings.SERVER_MODE != 'production':
-    class CdnStorageFinder(BaseStorageFinder):
+    # We need this during test and development in order to find the external
+    # static files which are managed with bower (using manage.py bower_install)
+    class BowerStorageFinder(BaseStorageFinder):
         storage = FileSystemStorage(location=settings.STATIC_ROOT, base_url=settings.STATIC_URL)