diff --git a/includes/discovery/os/barracuda.inc.php b/includes/discovery/os/barracudaloadbalancer.inc.php
similarity index 56%
rename from includes/discovery/os/barracuda.inc.php
rename to includes/discovery/os/barracudaloadbalancer.inc.php
index 51341ef449..74c612bf64 100644
--- a/includes/discovery/os/barracuda.inc.php
+++ b/includes/discovery/os/barracudaloadbalancer.inc.php
@@ -10,14 +10,6 @@
  * the source code distribution for details.
  */
 
-if (!$os) {
-    if (stristr($sysDescr, 'Barracuda Load Balancer') || stristr($sysDescr, 'Barracuda Load Balancer ADC')) {
-        $os = 'barracudaloadbalancer';
-    }
-    if (stristr($sysDescr, 'Barracuda Spam Firewall')) {
-        $os = 'barracudaspamfirewall';
-    }
-    if (stristr($sysDescr, 'Barracuda Firewall')) {
-        $os = 'barracudangfirewall';
-    }
+if (str_contains($sysDescr, array('Barracuda Load Balancer', 'Barracuda Load Balancer ADC'), true)) {
+    $os = 'barracudaloadbalancer';
 }
diff --git a/includes/discovery/os/barracudangfirewall.inc.php b/includes/discovery/os/barracudangfirewall.inc.php
new file mode 100644
index 0000000000..0143cf6c70
--- /dev/null
+++ b/includes/discovery/os/barracudangfirewall.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+ * LibreNMS Barracuda OS information module
+ *
+ * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (str_contains($sysDescr, 'Barracuda Firewall', true)) {
+    $os = 'barracudangfirewall';
+}
diff --git a/includes/discovery/os/barracudaspamfirewall.inc.php b/includes/discovery/os/barracudaspamfirewall.inc.php
new file mode 100644
index 0000000000..d573c14d52
--- /dev/null
+++ b/includes/discovery/os/barracudaspamfirewall.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+ * LibreNMS Barracuda OS information module
+ *
+ * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (str_contains($sysDescr, 'Barracuda Spam Firewall', true)) {
+    $os = 'barracudaspamfirewall';
+}
diff --git a/includes/discovery/os/bcm963.inc.php b/includes/discovery/os/bcm963.inc.php
index 4113d29e01..2fb0e09914 100644
--- a/includes/discovery/os/bcm963.inc.php
+++ b/includes/discovery/os/bcm963.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'bcm963')) {
-        $os = 'bcm963';
-    }
+if (str_contains($sysDescr, 'bcm963', true)) {
+    $os = 'bcm963';
 }
diff --git a/includes/discovery/os/bdcom.inc.php b/includes/discovery/os/bdcom.inc.php
index 151f9154bf..b4963a09b1 100644
--- a/includes/discovery/os/bdcom.inc.php
+++ b/includes/discovery/os/bdcom.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.3320.1')) {
-        $os = 'bdcom';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.3320.1')) {
+    $os = 'bdcom';
 }
diff --git a/includes/discovery/os/binos.inc.php b/includes/discovery/os/binos.inc.php
index 2b8aca40d3..e1f8cac818 100644
--- a/includes/discovery/os/binos.inc.php
+++ b/includes/discovery/os/binos.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * LibreNMS Telco Systems OS discovery module
  *
@@ -12,9 +11,6 @@
  * the source code distribution for details.
  */
 
-
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.738.1.5.100')) {
-        $os = 'binos';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.738.1.5.100')) {
+    $os = 'binos';
 }
diff --git a/includes/discovery/os/binox.inc.php b/includes/discovery/os/binox.inc.php
index bb145c99b1..f35bf66d51 100644
--- a/includes/discovery/os/binox.inc.php
+++ b/includes/discovery/os/binox.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * LibreNMS Telco Systems OS discovery module
  *
@@ -12,9 +11,6 @@
  * the source code distribution for details.
  */
 
-
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.738.10.5.100')) {
-        $os = 'binox';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.738.10.5.100')) {
+    $os = 'binox';
 }
diff --git a/includes/discovery/os/bintec-smart.inc.php b/includes/discovery/os/bintec-smart.inc.php
index d7b569a411..f7480127c6 100644
--- a/includes/discovery/os/bintec-smart.inc.php
+++ b/includes/discovery/os/bintec-smart.inc.php
@@ -9,8 +9,7 @@
  * option) any later version.  Please see LICENSE.txt at the top level of
  * the source code distribution for details.
  */
-if (!$os) {
-    if (strpos($sysObjectId, '1.3.6.1.4.1.272.4.201.82.78.79.48') !== false) {
-        $os = 'bintec-smart';
-    }
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.272.4.201.82.78.79.48')) {
+    $os = 'bintec-smart';
 }
diff --git a/includes/discovery/os/bnt.inc.php b/includes/discovery/os/bnt.inc.php
index 37e0a8b173..05a80c0f0a 100644
--- a/includes/discovery/os/bnt.inc.php
+++ b/includes/discovery/os/bnt.inc.php
@@ -1,11 +1,7 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'Blade Network Technologies')) {
-        $os = 'bnt';
-    }
-
-    if (preg_match('/^BNT /', $sysDescr)) {
-        $os = 'bnt';
-    }
+if (str_contains($sysDescr, 'Blade Network Technologies', true)) {
+    $os = 'bnt';
+} elseif (starts_with($sysDescr, 'BNT ')) {
+    $os = 'bnt';
 }
diff --git a/includes/discovery/os/brother.inc.php b/includes/discovery/os/brother.inc.php
index 4a0887cd29..4e5d382fc7 100644
--- a/includes/discovery/os/brother.inc.php
+++ b/includes/discovery/os/brother.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/Brother NC-.*(h|w),/', $sysDescr)) {
-        $os = 'brother';
-    }
+if (preg_match('/Brother NC-.*(h|w),/', $sysDescr)) {
+    $os = 'brother';
 }
diff --git a/includes/discovery/os/buffalo.inc.php b/includes/discovery/os/buffalo.inc.php
index 800e2687fb..99c5809af9 100644
--- a/includes/discovery/os/buffalo.inc.php
+++ b/includes/discovery/os/buffalo.inc.php
@@ -10,8 +10,6 @@
  * the source code distribution for details.
  */
 
-if (!$os) {
-    if (strstr($sysDescr, 'BUFFALO TeraStation')) {
-        $os = 'buffalo';
-    }
+if (str_contains($sysDescr, 'BUFFALO TeraStation')) {
+    $os = 'buffalo';
 }