diff --git a/bitbake/lib/toaster/bldcollector/__init__.py b/bitbake/lib/toaster/bldcollector/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bitbake/lib/toaster/orm/admin.py b/bitbake/lib/toaster/bldcollector/admin.py
similarity index 92%
rename from bitbake/lib/toaster/orm/admin.py
rename to bitbake/lib/toaster/bldcollector/admin.py
index 706e517e0e..c1f85d73d5 100644
--- a/bitbake/lib/toaster/orm/admin.py
+++ b/bitbake/lib/toaster/bldcollector/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.admin.filters import RelatedFieldListFilter
-from .models import BitbakeVersion, Release, LayerSource, ToasterSetting
+from orm.models import BitbakeVersion, Release, LayerSource, ToasterSetting
 from django.forms.widgets import Textarea
 from django import forms
 import django.db.models as models
@@ -31,4 +31,3 @@ admin.site.register(LayerSource, LayerSourceAdmin)
 admin.site.register(BitbakeVersion, BitbakeVersionAdmin)
 admin.site.register(Release, ReleaseAdmin)
 admin.site.register(ToasterSetting, ToasterSettingAdmin)
-
diff --git a/bitbake/lib/toaster/orm/urls.py b/bitbake/lib/toaster/bldcollector/urls.py
similarity index 95%
rename from bitbake/lib/toaster/orm/urls.py
rename to bitbake/lib/toaster/bldcollector/urls.py
index 961bc19070..144387b56a 100644
--- a/bitbake/lib/toaster/orm/urls.py
+++ b/bitbake/lib/toaster/bldcollector/urls.py
@@ -20,8 +20,7 @@
 from django.conf.urls import patterns, include, url
 from django.views.generic import RedirectView
 
-urlpatterns = patterns('orm.views',
+urlpatterns = patterns('bldcollector.views',
         # landing point for pushing a bitbake_eventlog.json file to this toaster instace
         url(r'^eventfile$', 'eventfile', name='eventfile'),
         )
-
diff --git a/bitbake/lib/toaster/orm/views.py b/bitbake/lib/toaster/bldcollector/views.py
similarity index 100%
rename from bitbake/lib/toaster/orm/views.py
rename to bitbake/lib/toaster/bldcollector/views.py
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 60e80de2f6..c72a90411b 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -268,7 +268,7 @@ INSTALLED_APPS = (
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
-    'orm',
+    'bldcollector',
     'toastermain',
     'south',
 )