diff --git a/LibreNMS/OS/AlcomaAlmp.php b/LibreNMS/OS/AlcomaAlmp.php
index c830941122..dfe1da28ed 100644
--- a/LibreNMS/OS/AlcomaAlmp.php
+++ b/LibreNMS/OS/AlcomaAlmp.php
@@ -47,9 +47,11 @@ class AlcomaAlmp extends OS implements
      */
     public function discoverWirelessFrequency()
     {
-        $oid = '.1.3.6.1.4.1.12140.2.3.1.0'; // ALCOMA-MIB::alMPTuneTX.0
         return array(
-            new WirelessSensor('frequency', $this->getDeviceId(), $oid, 'alcoma', 1, 'Frequency', null, 1, 1),
+            // ALCOMA-MIB::alMPTuneTX.0
+            new WirelessSensor('frequency', $this->getDeviceId(), '.1.3.6.1.4.1.12140.2.3.1.0', 'alcoma-tx', 1, 'TX Frequency', null, 1, 1),
+            // ALCOMA-MIB::alMPTuneRX.0
+            new WirelessSensor('frequency', $this->getDeviceId(), '.1.3.6.1.4.1.12140.2.3.2.0', 'alcoma-rx', 1, 'RX Frequency', null, 1, 1),
         );
     }
 
@@ -61,9 +63,11 @@ class AlcomaAlmp extends OS implements
      */
     public function discoverWirelessPower()
     {
-        $oid = '.1.3.6.1.4.1.12140.2.3.3.0'; // ALCOMA-MIB::alMPTX-PWR.0
         return array(
-            new WirelessSensor('power', $this->getDeviceId(), $oid, 'alcoma', 1, 'Tx Power'),
+            // ALCOMA-MIB::alMPTX-PWR.0
+            new WirelessSensor('power', $this->getDeviceId(), '.1.3.6.1.4.1.12140.2.3.3.0', 'alcoma-pow-cur', 1, 'Tx Power Current'),
+            // ALCOMA-MIB::alMPPTX.0
+            new WirelessSensor('power', $this->getDeviceId(), '.1.3.6.1.4.1.12140.2.3.13.0', 'alcoma-pow-conf', 1, 'Tx Power Configured'),
         );
     }
 
diff --git a/LibreNMS/OS/Ray.php b/LibreNMS/OS/Ray.php
index ca5c20ab58..f693b515c0 100644
--- a/LibreNMS/OS/Ray.php
+++ b/LibreNMS/OS/Ray.php
@@ -47,9 +47,11 @@ class Ray extends OS implements
      */
     public function discoverWirelessFrequency()
     {
-        $oid = '.1.3.6.1.4.1.33555.1.2.1.4'; // RAY-MIB::txFreq.0
         return array(
-            new WirelessSensor('frequency', $this->getDeviceId(), $oid, 'racom', 1, 'Frequency', null, 1, 1000),
+            // RAY-MIB::txFreq.0
+            new WirelessSensor('frequency', $this->getDeviceId(), '.1.3.6.1.4.1.33555.1.2.1.4', 'racom-tx', 1, 'TX Frequency', null, 1, 1000),
+            // RAY-MIB::rxFreq.0
+            new WirelessSensor('frequency', $this->getDeviceId(), '.1.3.6.1.4.1.33555.1.2.1.3', 'racom-rx', 1, 'RX Frequency', null, 1, 1000),
         );
     }
 
@@ -61,9 +63,11 @@ class Ray extends OS implements
      */
     public function discoverWirelessPower()
     {
-        $oid = '.1.3.6.1.4.1.33555.1.2.1.17'; // RAY-MIB::rfPowerCurrent.0
         return array(
-            new WirelessSensor('power', $this->getDeviceId(), $oid, 'racom', 1, 'Tx Power'),
+            // RAY-MIB::rfPowerCurrent.0
+            new WirelessSensor('power', $this->getDeviceId(), '.1.3.6.1.4.1.33555.1.2.1.17', 'racom-pow-cur', 1, 'Tx Power Current'),
+            //RAY-MIB::rfPowerConfigured.0
+            new WirelessSensor('power', $this->getDeviceId(), '.1.3.6.1.4.1.33555.1.2.1.12', 'racom-pow-conf', 1, 'Tx Power Configured'),
         );
     }