diff --git a/backups/models/backup.py b/backups/models/backup.py
index a20edfb..4682c05 100644
--- a/backups/models/backup.py
+++ b/backups/models/backup.py
@@ -1,7 +1,7 @@
 from django.db import models
 
 from core.models import Category, Weekday
-from inventory.models import Computer
+from computers.models import Computer
 from softwares.models import Software
 
 from .notification import Notification
diff --git a/backups/tests/test_backup_detail_view.py b/backups/tests/test_backup_detail_view.py
index 12dab83..0a743e0 100644
--- a/backups/tests/test_backup_detail_view.py
+++ b/backups/tests/test_backup_detail_view.py
@@ -15,7 +15,7 @@ def test_backup_detail_view_not_logged_in():
 
 def test_backup_detail_view(create_admin_user):
     create_admin_user()
-    mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    mixer.blend('computers.Computer', customer=mixer.SELECT)
     backup = mixer.blend('backups.Backup', computer=mixer.SELECT)
     client = Client()
     client.login(username="novartis-admin", password="password")
@@ -37,7 +37,7 @@ def test_customer_computer_table_no_permission(create_admin_user):
     customer = Customer.objects.create(name='Nestle')
     client = Client()
     client.login(username="novartis-admin", password="password")
-    mixer.blend('inventory.Computer', customer=customer)
+    mixer.blend('computers.Computer', customer=customer)
     backup = mixer.blend('backups.Backup', computer=mixer.SELECT)
     response = client.get('/backup/' + str(backup.id) + '/')
     assert response.status_code == 403
@@ -45,8 +45,8 @@ def test_customer_computer_table_no_permission(create_admin_user):
 
 def test_backup_detail_view_with_target_device(create_admin_user):
     create_admin_user()
-    source_computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
-    target_computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    source_computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
+    target_computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
     backup = mixer.blend('backups.Backup', computer=source_computer,
                          software=mixer.SELECT, method=mixer.SELECT)
     mixer.blend('backups.TargetDevice', device=target_computer,
@@ -61,7 +61,7 @@ def test_backup_detail_view_with_target_device(create_admin_user):
 
 def test_backup_detail_view_with_notification(create_admin_user):
     create_admin_user()
-    mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    mixer.blend('computers.Computer', customer=mixer.SELECT)
     backup = mixer.blend('backups.Backup', computer=mixer.SELECT)
     notification = mixer.blend('backups.Notification')
     mixer.blend('backups.NotificationFromBackup',
diff --git a/backups/tests/test_customer_backup_table_view.py b/backups/tests/test_customer_backup_table_view.py
index ad4d1d2..26a22bb 100644
--- a/backups/tests/test_customer_backup_table_view.py
+++ b/backups/tests/test_customer_backup_table_view.py
@@ -20,7 +20,7 @@ def test_customer_backup_table(create_admin_user):
     customer = fixture['customer']
     client = Client()
     client.login(username="novartis-admin", password="password")
-    computer = mixer.blend('inventory.Computer', customer=customer)
+    computer = mixer.blend('computers.Computer', customer=customer)
     backup = mixer.blend('backups.Backup', computer=computer)
     response = client.get('/customer/' + str(customer.id) + '/backups/')
     assert (response.status_code == 200
@@ -41,7 +41,7 @@ def test_customer_backup_table_no_permission(create_admin_user):
     customer = Customer.objects.create(name='Nestle')
     client = Client()
     client.login(username="novartis-admin", password="password")
-    computer = mixer.blend('inventory.Computer', customer=customer)
+    computer = mixer.blend('computers.Computer', customer=customer)
     mixer.blend('backups.Backup', computer=computer)
     response = client.get('/customer/' + str(customer.id) + '/backups/')
     assert response.status_code == 403
@@ -52,7 +52,7 @@ def test_customer_backup_table_with_multiple_backups(create_admin_user):
     customer = fixture['customer']
     client = Client()
     client.login(username="novartis-admin", password="password")
-    computer = mixer.blend('inventory.Computer', customer=customer)
+    computer = mixer.blend('computers.Computer', customer=customer)
     backup1 = mixer.blend('backups.Backup', computer=computer)
     backup2 = mixer.blend('backups.Backup', computer=computer)
     response = client.get('/customer/' + str(customer.id) + '/backups/')
diff --git a/backups/views.py b/backups/views.py
index 067d20f..0c01a7c 100644
--- a/backups/views.py
+++ b/backups/views.py
@@ -4,7 +4,7 @@ from django.shortcuts import get_object_or_404
 
 from django_tables2 import RequestConfig
 
-from inventory.models import Computer
+from computers.models import Computer
 from customers.decorators import customer_view_permission
 
 from .decorators import backup_view_permission
diff --git a/inventory/__init__.py b/computers/__init__.py
similarity index 100%
rename from inventory/__init__.py
rename to computers/__init__.py
diff --git a/inventory/admin.py b/computers/admin.py
similarity index 100%
rename from inventory/admin.py
rename to computers/admin.py
diff --git a/computers/apps.py b/computers/apps.py
new file mode 100644
index 0000000..f902f84
--- /dev/null
+++ b/computers/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ComputersConfig(AppConfig):
+    name = 'computers'
diff --git a/inventory/decorators.py b/computers/decorators.py
similarity index 100%
rename from inventory/decorators.py
rename to computers/decorators.py
diff --git a/inventory/filters.py b/computers/filters.py
similarity index 100%
rename from inventory/filters.py
rename to computers/filters.py
diff --git a/inventory/fixtures/inventory.yaml b/computers/fixtures/computers.yaml
similarity index 59%
rename from inventory/fixtures/inventory.yaml
rename to computers/fixtures/computers.yaml
index 2a608fd..8690d2f 100644
--- a/inventory/fixtures/inventory.yaml
+++ b/computers/fixtures/computers.yaml
@@ -1,134 +1,134 @@
-- model: inventory.CpuManufacturer
+- model: computers.CpuManufacturer
   fields:
     name: Intel
-- model: inventory.CpuManufacturer
+- model: computers.CpuManufacturer
   fields:
     name: AMD
-- model: inventory.CpuArchitecture
+- model: computers.CpuArchitecture
   fields:
     name: x86_64
-- model: inventory.CpuArchitecture
+- model: computers.CpuArchitecture
   fields:
     name: i686
-- model: inventory.CpuArchitecture
+- model: computers.CpuArchitecture
   fields:
     name: ARM
-- model: inventory.CpuArchitecture
+- model: computers.CpuArchitecture
   fields:
     name: ARM64
 
-- model: inventory.RamType
+- model: computers.RamType
   fields:
     name: unkown
-- model: inventory.RamType
+- model: computers.RamType
   fields:
     name: DDR2
-- model: inventory.RamType
+- model: computers.RamType
   fields:
     name: DDR3
-- model: inventory.RamType
+- model: computers.RamType
   fields:
     name: DDR4
 
-- model: inventory.DiskType
+- model: computers.DiskType
   fields:
     name: SSD
-- model: inventory.DiskType
+- model: computers.DiskType
   fields:
     name: HDD
-- model: inventory.DiskType
+- model: computers.DiskType
   fields:
     name: SAS
 
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 0"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 1"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 5"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 6"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 10"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 50"
-- model: inventory.RaidType
+- model: computers.RaidType
   fields:
     name: "RAID 60"
 
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 1
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 2
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 4
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 8
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 16
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 24
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 32
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 64
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 96
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 128
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 256
     ecc: False
 -
-  model: inventory.Ram
+  model: computers.Ram
   fields:
     ram_type: 1
     size_in_gb: 512
diff --git a/inventory/models/__init__.py b/computers/models/__init__.py
similarity index 100%
rename from inventory/models/__init__.py
rename to computers/models/__init__.py
diff --git a/inventory/models/computer.py b/computers/models/computer.py
similarity index 100%
rename from inventory/models/computer.py
rename to computers/models/computer.py
diff --git a/inventory/models/cpu.py b/computers/models/cpu.py
similarity index 100%
rename from inventory/models/cpu.py
rename to computers/models/cpu.py
diff --git a/inventory/models/disk.py b/computers/models/disk.py
similarity index 100%
rename from inventory/models/disk.py
rename to computers/models/disk.py
diff --git a/inventory/models/raid.py b/computers/models/raid.py
similarity index 100%
rename from inventory/models/raid.py
rename to computers/models/raid.py
diff --git a/inventory/models/ram.py b/computers/models/ram.py
similarity index 100%
rename from inventory/models/ram.py
rename to computers/models/ram.py
diff --git a/inventory/models/warranty.py b/computers/models/warranty.py
similarity index 100%
rename from inventory/models/warranty.py
rename to computers/models/warranty.py
diff --git a/inventory/static/inventory/css/inventory.css b/computers/static/inventory/css/inventory.css
similarity index 100%
rename from inventory/static/inventory/css/inventory.css
rename to computers/static/inventory/css/inventory.css
diff --git a/inventory/static/inventory/js/sorttable.js b/computers/static/inventory/js/sorttable.js
similarity index 100%
rename from inventory/static/inventory/js/sorttable.js
rename to computers/static/inventory/js/sorttable.js
diff --git a/inventory/tables.py b/computers/tables.py
similarity index 100%
rename from inventory/tables.py
rename to computers/tables.py
diff --git a/inventory/templates/inventory/all_computers.html b/computers/templates/computers/all_computers.html
similarity index 100%
rename from inventory/templates/inventory/all_computers.html
rename to computers/templates/computers/all_computers.html
diff --git a/inventory/templates/inventory/computer_details.html b/computers/templates/computers/computer_details.html
similarity index 100%
rename from inventory/templates/inventory/computer_details.html
rename to computers/templates/computers/computer_details.html
diff --git a/inventory/templates/inventory/computer_list.html b/computers/templates/computers/computer_list.html
similarity index 100%
rename from inventory/templates/inventory/computer_list.html
rename to computers/templates/computers/computer_list.html
diff --git a/inventory/templates/inventory/cronjob_details.html b/computers/templates/computers/cronjob_details.html
similarity index 100%
rename from inventory/templates/inventory/cronjob_details.html
rename to computers/templates/computers/cronjob_details.html
diff --git a/inventory/templates/inventory/cronjob_list.html b/computers/templates/computers/cronjob_list.html
similarity index 100%
rename from inventory/templates/inventory/cronjob_list.html
rename to computers/templates/computers/cronjob_list.html
diff --git a/inventory/tests/test_computer.py b/computers/tests/test_computer.py
similarity index 81%
rename from inventory/tests/test_computer.py
rename to computers/tests/test_computer.py
index aa1cb45..631c88b 100644
--- a/inventory/tests/test_computer.py
+++ b/computers/tests/test_computer.py
@@ -5,6 +5,6 @@ pytestmark = pytest.mark.django_db
 
 
 def test_computer_reverse_url():
-    computer = mixer.blend('inventory.Computer')
+    computer = mixer.blend('computers.Computer')
     assert (computer.get_absolute_url()
             == "/computer/" + str(computer.id) + "/")
diff --git a/inventory/tests/test_computer_detail_view.py b/computers/tests/test_computer_detail_view.py
similarity index 74%
rename from inventory/tests/test_computer_detail_view.py
rename to computers/tests/test_computer_detail_view.py
index dfbba9c..7e01add 100644
--- a/inventory/tests/test_computer_detail_view.py
+++ b/computers/tests/test_computer_detail_view.py
@@ -15,7 +15,7 @@ def test_computer_detail_view_not_logged_in():
 
 def test_computer_detail_view(create_admin_user):
     create_admin_user()
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computer/' + str(computer.id) + '/')
@@ -33,10 +33,10 @@ def test_computer_detail_view_not_found(create_admin_user):
 
 def test_computer_detail_view_ram_relation(create_admin_user):
     create_admin_user()
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
-    ram_type = mixer.blend('inventory.RamType')
-    ram = mixer.blend('inventory.Ram', ram_type=ram_type)
-    mixer.blend('inventory.ComputerRamRelation', computer=computer, ram=ram)
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
+    ram_type = mixer.blend('computers.RamType')
+    ram = mixer.blend('computers.Ram', ram_type=ram_type)
+    mixer.blend('computers.ComputerRamRelation', computer=computer, ram=ram)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computer/' + str(computer.id) + '/')
@@ -46,13 +46,13 @@ def test_computer_detail_view_ram_relation(create_admin_user):
 
 def test_computer_detail_view_raid_relation(create_admin_user):
     create_admin_user()
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
-    raid_type = mixer.blend('inventory.RaidType')
-    disk = mixer.blend('inventory.Disk')
-    raid = mixer.blend('inventory.Raid',
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
+    raid_type = mixer.blend('computers.RaidType')
+    disk = mixer.blend('computers.Disk')
+    raid = mixer.blend('computers.Raid',
                        computer=computer,
                        raid_type=raid_type)
-    mixer.blend('inventory.DisksInRaid', raid=raid, disk=disk)
+    mixer.blend('computers.DisksInRaid', raid=raid, disk=disk)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computer/' + str(computer.id) + '/')
@@ -61,9 +61,9 @@ def test_computer_detail_view_raid_relation(create_admin_user):
 
 def test_computer_detail_view_cpu_relation(create_admin_user):
     create_admin_user()
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
-    cpu = mixer.blend('inventory.Cpu', cpu_typ=mixer.SELECT)
-    mixer.blend('inventory.ComputerCpuRelation', cpu=cpu, computer=computer)
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
+    cpu = mixer.blend('computers.Cpu', cpu_typ=mixer.SELECT)
+    mixer.blend('computers.ComputerCpuRelation', cpu=cpu, computer=computer)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computer/' + str(computer.id) + '/')
@@ -74,7 +74,7 @@ def test_computer_detail_view_cpu_relation(create_admin_user):
 def test_computer_detail_view_no_permission(create_admin_user):
     create_admin_user()
     customer = mixer.blend('customers.Customer')
-    computer = mixer.blend('inventory.Computer', customer=customer)
+    computer = mixer.blend('computers.Computer', customer=customer)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computer/' + str(computer.id) + '/')
diff --git a/inventory/tests/test_computer_list_view.py b/computers/tests/test_computer_list_view.py
similarity index 93%
rename from inventory/tests/test_computer_list_view.py
rename to computers/tests/test_computer_list_view.py
index 55065ee..cc12d9f 100644
--- a/inventory/tests/test_computer_list_view.py
+++ b/computers/tests/test_computer_list_view.py
@@ -23,7 +23,7 @@ def test_computer_list_view_no_computers(create_admin_user):
 
 def test_computer_list_view(create_admin_user):
     create_admin_user()
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/computers/all/')
diff --git a/inventory/tests/test_customer_computer_table_view.py b/computers/tests/test_customer_computer_table_view.py
similarity index 88%
rename from inventory/tests/test_customer_computer_table_view.py
rename to computers/tests/test_customer_computer_table_view.py
index b663d7c..f5e2b7c 100644
--- a/inventory/tests/test_customer_computer_table_view.py
+++ b/computers/tests/test_customer_computer_table_view.py
@@ -19,7 +19,7 @@ def test_customer_computer_table(create_admin_user):
     customer = fixture['customer']
     client = Client()
     client.login(username="novartis-admin", password="password")
-    computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
     response = client.get('/customer/' + str(customer.id) + '/computers/')
     assert (response.status_code == 200
             and helper.in_content(response, computer))
@@ -40,7 +40,7 @@ def test_customer_computer_table_no_permission(create_admin_user):
     customer = Customer.objects.create(name='Nestle')
     client = Client()
     client.login(username="novartis-admin", password="password")
-    mixer.blend('inventory.Computer', customer=customer)
+    mixer.blend('computers.Computer', customer=customer)
     response = client.get('/customer/' + str(customer.id) + '/computers/')
     assert response.status_code == 403
 
@@ -50,8 +50,8 @@ def test_customer_computer_table_multiple_computers(create_admin_user):
     customer = fixture['customer']
     client = Client()
     client.login(username="novartis-admin", password="password")
-    computer1 = mixer.blend('inventory.Computer', customer=mixer.SELECT)
-    computer2 = mixer.blend('inventory.Computer', customer=mixer.SELECT)
+    computer1 = mixer.blend('computers.Computer', customer=mixer.SELECT)
+    computer2 = mixer.blend('computers.Computer', customer=mixer.SELECT)
     response = client.get('/customer/' + str(customer.id) + '/computers/')
     assert (response.status_code == 200
             and helper.in_content(response, computer1)
diff --git a/inventory/urls.py b/computers/urls.py
similarity index 100%
rename from inventory/urls.py
rename to computers/urls.py
diff --git a/inventory/views.py b/computers/views.py
similarity index 93%
rename from inventory/views.py
rename to computers/views.py
index a191765..8c0e268 100644
--- a/inventory/views.py
+++ b/computers/views.py
@@ -46,7 +46,7 @@ def computer_detail_view(request, pk):
                'raid_disk_pairs': raid_disk_pairs,
                'backup_list': backup_list,
                'licenses': licenses}
-    return render(request, 'inventory/computer_details.html', context)
+    return render(request, 'computers/computer_details.html', context)
 
 
 @login_required
@@ -54,13 +54,13 @@ def computer_detail_view(request, pk):
 def computers_table_view(request, pk):
     table = ComputersTable(Computer.objects.filter(customer=pk))
     RequestConfig(request).configure(table)
-    return render(request, 'inventory/computer_list.html', {'computers': table})
+    return render(request, 'computers/computer_list.html', {'computers': table})
 
 
 class ComputersFilterView(LoginRequiredMixin, SingleTableMixin, FilterView):
     table_class = ComputersTable
     model = Computer
-    template_name = "inventory/all_computers.html"
+    template_name = "computers/all_computers.html"
 
     filterset_class = ComputerFilter
 
diff --git a/conftest.py b/conftest.py
index a64b8ef..d0c025a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -11,9 +11,9 @@ from guardian.shortcuts import assign_perm
 def django_db_setup(django_db_setup, django_db_blocker):
     with django_db_blocker.unblock():
         call_command('loaddata', 'backups.yaml')
+        call_command('loaddata', 'computers.yaml')
         call_command('loaddata', 'core.yaml')
         call_command('loaddata', 'devices.yaml')
-        call_command('loaddata', 'inventory.yaml')
         call_command('loaddata', 'nets.yaml')
         call_command('loaddata', 'softwares.yaml')
 
diff --git a/inventory/apps.py b/inventory/apps.py
deleted file mode 100644
index 532ae97..0000000
--- a/inventory/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class InventoryConfig(AppConfig):
-    name = 'inventory'
diff --git a/licenses/models.py b/licenses/models.py
index 12f7767..866cb6e 100644
--- a/licenses/models.py
+++ b/licenses/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 
 from customers.models import Customer
-from inventory.models import Computer
+from computers.models import Computer
 from users.models import User
 from softwares.models import Software
 
diff --git a/licenses/tests/test_license.py b/licenses/tests/test_license.py
index 4d07ed1..50a55ee 100644
--- a/licenses/tests/test_license.py
+++ b/licenses/tests/test_license.py
@@ -16,7 +16,7 @@ def test_license_two_licenses_per_user():
 
 
 def test_license_two_licenses_per_computer():
-    mixer.blend('inventory.Computer')
+    mixer.blend('computers.Computer')
     mixer.blend('licenses.ComputerLicense')
     with pytest.raises(IntegrityError):
         mixer.cycle(2).blend('licenses.LicenseWithComputer',
diff --git a/nets/tests/test_views/test_net_detail_view.py b/nets/tests/test_views/test_net_detail_view.py
index 21a7ff6..54aeab6 100644
--- a/nets/tests/test_views/test_net_detail_view.py
+++ b/nets/tests/test_views/test_net_detail_view.py
@@ -14,7 +14,7 @@ def test_net_detail_view_no_permission(create_admin_user):
     create_admin_user()
     net = mixer.blend('nets.Net')
     customer = mixer.blend('customers.Customer')
-    device = mixer.blend('inventory.Computer', customer=customer)
+    device = mixer.blend('computers.Computer', customer=customer)
     mixer.blend('devices.DeviceInNet',
                 device=device,
                 net=net,
@@ -28,7 +28,7 @@ def test_net_detail_view_no_permission(create_admin_user):
 def test_net_detail_view(create_admin_user):
     fixture = create_admin_user()
     net = mixer.blend('nets.Net', customer=mixer.SELECT)
-    device = mixer.blend('inventory.Computer', customer=fixture['customer'])
+    device = mixer.blend('computers.Computer', customer=fixture['customer'])
     device_in_net = DeviceInNet.objects.create(device=device,
                                                net=net, ip='10.7.89.101')
     client = Client()
diff --git a/network_inventory/settings/base.py b/network_inventory/settings/base.py
index 524d5b6..1058869 100644
--- a/network_inventory/settings/base.py
+++ b/network_inventory/settings/base.py
@@ -23,6 +23,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 INSTALLED_APPS = [
     'backups.apps.BackupsConfig',
+    'computers.apps.ComputersConfig',
     'core.apps.CoreConfig',
     'customers.apps.CustomersConfig',
     'devices.apps.DevicesConfig',
@@ -35,7 +36,6 @@ INSTALLED_APPS = [
     'django_filters',
     'django_tables2',
     'guardian',
-    'inventory.apps.InventoryConfig',
     'licenses.apps.LicensesConfig',
     'nested_admin',
     'nets.apps.NetsConfig',
diff --git a/network_inventory/urls.py b/network_inventory/urls.py
index a5dbc3c..2759a3e 100644
--- a/network_inventory/urls.py
+++ b/network_inventory/urls.py
@@ -19,10 +19,10 @@ from django.urls import path
 
 urlpatterns = [
     url(r'', include('backups.urls')),
+    url(r'', include('computers.urls')),
     url(r'', include('core.urls')),
     url(r'', include('customers.urls')),
     url(r'', include('devices.urls')),
-    url(r'', include('inventory.urls')),
     url(r'', include('licenses.urls')),
     url(r'', include('nets.urls')),
     url(r'', include('users.urls')),
diff --git a/run.sh b/run.sh
index 84790b6..c01fddb 100755
--- a/run.sh
+++ b/run.sh
@@ -5,10 +5,10 @@ if [ -f ./.second_run ]; then
     python manage.py migrate
 else
     python manage.py makemigrations backups
+    python manage.py makemigrations computers
     python manage.py makemigrations core
     python manage.py makemigrations customers
     python manage.py makemigrations devices
-    python manage.py makemigrations inventory
     python manage.py makemigrations licenses
     python manage.py makemigrations nets
     python manage.py makemigrations softwares
@@ -16,9 +16,9 @@ else
     python manage.py makemigrations
     python manage.py migrate
     python manage.py loaddata backups
+    python manage.py loaddata computers
     python manage.py loaddata core
     python manage.py loaddata devices
-    python manage.py loaddata inventory
     python manage.py loaddata nets
     python manage.py loaddata softwares
     python manage.py shell -c "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@example.com', 'password')"
diff --git a/users/tests/test_user_detail_view.py b/users/tests/test_user_detail_view.py
index 005e456..99313a1 100644
--- a/users/tests/test_user_detail_view.py
+++ b/users/tests/test_user_detail_view.py
@@ -81,7 +81,7 @@ def test_user_detail_view_license(create_admin_user):
 def test_user_detail_view_computer(create_admin_user):
     create_admin_user()
     user = mixer.blend('users.User', customer=mixer.SELECT)
-    computer = mixer.blend('inventory.Computer', user=user)
+    computer = mixer.blend('computers.Computer', user=user)
     client = Client()
     client.login(username="novartis-admin", password="password")
     response = client.get('/user/' + str(user.id) + '/')
diff --git a/users/views.py b/users/views.py
index 22cf816..4eed726 100644
--- a/users/views.py
+++ b/users/views.py
@@ -5,7 +5,7 @@ from django.shortcuts import render
 from django_tables2 import RequestConfig
 
 from customers.decorators import customer_view_permission
-from inventory.models import Computer
+from computers.models import Computer
 from licenses.models import LicenseWithUser
 
 from .decorators import user_view_permission