diff --git a/includes/definitions/ciscosmblinux.yaml b/includes/definitions/ciscosmblinux.yaml
deleted file mode 100644
index 3508d219f6..0000000000
--- a/includes/definitions/ciscosmblinux.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-os: ciscosmblinux
-type: wireless
-group: unix
-text: 'Cisco SMB Linux'
-icon: cisco
-over:
-    - { graph: device_bits, text: 'Device Traffic' }
-    - { graph: device_processor, text: 'Processor Usage' }
-    - { graph: device_mempool, text: 'Memory Usage' }
-discovery:
-   - sysDescr_regex: '/^Linux.*Cisco Small Business/'
-
-poller_modules:
-    cisco-cbqos: 1
-    cisco-cef: 1
-    cisco-mac-accounting: 1
-    cisco-voice: 1
-    cisco-remote-access-monitor: 1
-    cisco-sla: 1
-    cisco-ipsec-flow-monitor: 1
-    cipsec-tunnels: 1
-    cisco-otv: 1
-discovery_modules:
-    cisco-cef: 1
-    cisco-sla: 1
-    cisco-mac-accounting: 1
-    cisco-otv: 1
-    cisco-pw: 1
-    cisco-vrf: 1
-    cisco-vrf-lite: 1
-mib_dir:
-    - cisco
-processor_stacked: 1
diff --git a/includes/definitions/ciscowap.yaml b/includes/definitions/ciscowap.yaml
index ba6ced0e48..0e712d230f 100644
--- a/includes/definitions/ciscowap.yaml
+++ b/includes/definitions/ciscowap.yaml
@@ -1,10 +1,15 @@
 os: ciscowap
-text: 'Cisco Wireless Acess Point'
+text: 'Cisco Wireless Access Point'
 type: wireless
+group: unix
 icon: cisco
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'Processor Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }
 discovery:
     - sysObjectId:
-        - .1.3.6.1.4.1.9.6.1.32.321.1
+        - .1.3.6.1.4.1.9.6.1.32.
     - sysDescr:
         - 'Cisco Small Business WAP'
 poller_modules:
@@ -16,12 +21,15 @@ poller_modules:
     cisco-sla: 1
     cisco-ipsec-flow-monitor: 1
     cipsec-tunnels: 1
+    cisco-otv: 1
 discovery_modules:
     cisco-cef: 1
     cisco-sla: 1
     cisco-mac-accounting: 1
+    cisco-otv: 1
     cisco-pw: 1
     cisco-vrf: 1
     cisco-vrf-lite: 1
 mib_dir:
     - cisco
+processor_stacked: 1
diff --git a/tests/snmpsim/ciscosmblinux.snmprec b/tests/snmpsim/ciscowap_121.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosmblinux.snmprec
rename to tests/snmpsim/ciscowap_121.snmprec
diff --git a/tests/snmpsim/ciscowap_121ek9.snmprec b/tests/snmpsim/ciscowap_121ek9.snmprec
new file mode 100644
index 0000000000..b7868e6c92
--- /dev/null
+++ b/tests/snmpsim/ciscowap_121ek9.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux 2.6.21.5-lvl7-dev, Cisco Small Business WAP121 (WAP121-E-K9), Version 1.0.6.5 Wed Oct 12 07:42:51 EDT 2016
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.32.121.1