diff --git a/console.sh b/console.sh
index d6f00a6..6b8375f 100755
--- a/console.sh
+++ b/console.sh
@@ -1,12 +1,3 @@
 #!/bin/sh
 . ./roles/home-cli/files/profile
-if [ $(uname -s) = FreeBSD ]
-then
-	INVENTORY=./inventories/freebsd.ini
-elif [ $(uname -s) = OpenBSD ]
-then
-	INVENTORY=./inventories/openbsd.ini
-else
-	INVENTORY=./local.ini
-fi
-./user-cli.yml -i $INVENTORY
+./user-cli.yml -i ./inventories/$(uname -s).ini
diff --git a/desktop.sh b/desktop.sh
index e242bf3..54c8e69 100755
--- a/desktop.sh
+++ b/desktop.sh
@@ -1,12 +1,3 @@
 #!/bin/sh
 . ./roles/home-cli/files/profile
-if [ $(uname -s) = FreeBSD ]
-then
-	INVENTORY=./inventories/freebsd.ini
-elif [ $(uname -s) = OpenBSD ]
-then
-	INVENTORY=./inventories/openbsd.ini
-else
-	INVENTORY=./local.ini
-fi
-./user-gui.yml -i $INVENTORY
+./user-gui.yml -i ./inventories/$(uname -s).ini
diff --git a/inventories/freebsd.ini b/inventories/FreeBSD.ini
similarity index 100%
rename from inventories/freebsd.ini
rename to inventories/FreeBSD.ini
diff --git a/local.ini b/inventories/Linux.ini
similarity index 100%
rename from local.ini
rename to inventories/Linux.ini
diff --git a/inventories/netbsd.ini b/inventories/NetBSD.ini
similarity index 100%
rename from inventories/netbsd.ini
rename to inventories/NetBSD.ini
diff --git a/inventories/openbsd.ini b/inventories/OpenBSD.ini
similarity index 100%
rename from inventories/openbsd.ini
rename to inventories/OpenBSD.ini