diff --git a/includes/polling/aironet_wifi_clients.inc.php b/includes/polling/wifi.inc.php
similarity index 90%
rename from includes/polling/aironet_wifi_clients.inc.php
rename to includes/polling/wifi.inc.php
index f213d0070c..b35307f3dc 100644
--- a/includes/polling/aironet_wifi_clients.inc.php
+++ b/includes/polling/wifi.inc.php
@@ -4,12 +4,14 @@ echo "Wireless: ";
 
 if ($device['type'] == 'network')
 {
-  if ($device['os'] == 'aironet')
+
+  ##### GENERIC FRAMEWORK, FILLING VARIABLES
+  if ($device['os'] == 'airport')
   {
 
-    echo "Checking aironet Wireless clients... ";
+    echo "Checking Airport Wireless clients... ";
 
-    $wificlients1 = snmp_get($device, "wirelessNumber.0", "-OUqnv", "aironet-BASESTATION-3-MIB") +0;
+    $wificlients1 = snmp_get($device, "wirelessNumber.0", "-OUqnv", "AIRPORT-BASESTATION-3-MIB") +0;
 
     echo($wificlients1 . " clients\n");
 
@@ -26,6 +28,9 @@ if ($device['type'] == 'network')
     
     echo ($wificlients1 +0) . " clients on dot11Radio0, " . ($wificlients2 +0) . " clients on dot11Radio1\n";
   }
+  
+  
+  ##### RRD Filling Code
 
   if (isset($wificlients1) && $wificlients1 != "")
   {
diff --git a/poller.php b/poller.php
index bc667796f5..5031fdc7e4 100755
--- a/poller.php
+++ b/poller.php
@@ -199,7 +199,7 @@ while ($device = mysql_fetch_array($device_query))
     include("includes/polling/toner.inc.php");
     include("includes/polling/ucd-diskio.inc.php");
     include("includes/polling/applications.inc.php");
-    include("includes/polling/aironet_wifi_clients.inc.php");
+    include("includes/polling/wifi.inc.php");
 
     #include("includes/polling/altiga-ssl.inc.php");
     include("includes/polling/cisco-ipsec-flow-monitor.inc.php");