diff --git a/softwares/fixtures/softwares.yaml b/softwares/fixtures/softwares.yaml
index 77fd677..64fe460 100644
--- a/softwares/fixtures/softwares.yaml
+++ b/softwares/fixtures/softwares.yaml
@@ -143,186 +143,186 @@
     name: 'Panda Antivirus Pro'
     category: '3'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows XP'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 7 Home'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 7 Pro'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 7 Enterprise'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8 Home'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8 Pro'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8 Enterprise'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8.1 Home'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8.1 Pro'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 8.1 Enterprise'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 10 Home'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 10 Pro'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: FreeBSD
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'VMware ESXi 6.5.0'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 10 Enterprise'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Server 2003'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Server 2008'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Server 2012'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Server 2012 R2'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Server 2016'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Ubuntu 14.04'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Ubuntu 16.04'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'VMware ESXi 6.0.0'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'pfsense 2.4.x'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'VMware vCenter Server Appliance 6.0.0'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 4.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 5.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 6.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 7.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 8.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 9.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 10.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'iOS 11.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 4.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 5.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 6.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 7.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 8.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 9.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 10.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'tvOS 11.X'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'VMware ESXi 5.5.0'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'VMware vCenter Server Appliance 6.5.0'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows Storage Server 2016 Standard'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Windows 7 Home Premium'
 -
-  model: inventory.OperatingSystem
+  model: softwares.OperatingSystem
   fields:
     name: 'Ubuntu 18.04'