diff --git a/README.md b/README.md
index 339d9b20f..46d9683a1 100644
--- a/README.md
+++ b/README.md
@@ -44,101 +44,103 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
     * [Model](#model)
 
 # Supported OS types
+ * Vendor
+   * OS - model_name
 
  * A10 Networks
-   * ACOS
+   * ACOS - acos
  * Alcatel-Lucent
-   * AOS
-   * AOS7
-   * ISAM
-   * Wireless
+   * AOS - aos
+   * AOS7 - aos7
+   * ISAM - isam
+   * Wireless 0
  * Alvarion
-   * BreezeACCESS
+   * BreezeACCESS - alvarion
  * Arista
-   * EOS
+   * EOS - eos
  * Arris
-   * C4CMTS
+   * C4CMTS - c4cmts
  * Aruba
-   * AOSW
+   * AOSW - aosw
  * Brocade
-   * FabricOS
-   * Ironware
-   * NOS (Network Operating System)
-   * Vyatta
-   * 6910
+   * FabricOS - fabricos
+   * Ironware - ironware
+   * NOS (Network Operating System) - nos
+   * Vyatta - vyatta
+   * 6910 - br6910
  * Check Point
-   * GaiaOS
+   * GaiaOS - gaiaos
  * Ciena
-   * SOAS
+   * SOAS - saos
  * Cisco
-   * AireOS
-   * ASA
-   * CatOS
-   * IOS
-   * IOSXR
-   * NXOS
-   * SMB (Nikola series)
+   * AireOS - aireos
+   * ASA - asa
+   * CatOS - catos
+   * IOS - ios
+   * IOSXR - iosxr
+   * NXOS - nxos
+   * SMB (Nikola series) 
  * Citrix
-   * NetScaler (Virtual Applicance)
+   * NetScaler (Virtual Applicance) - netscaler
  * Coriant (former Tellabs)
-   * TMOS (8800)
-   * 8600
+   * TMOS (8800) - tmos
+   * 8600 - 
  * Cumulus
    * Linux
  * DataCom
    * DmSwitch 3000
  * DELL
-   * PowerConnect
-   * AOSW
+   * PowerConnect - powerconnect
+   * AOSW - aosw
  * Ericsson/Redback
-   * IPOS (former SEOS)
+   * IPOS (former SEOS) - ipos
  * Extreme Networks
-   * XOS
+   * XOS - xos
    * WM
  * F5
    * TMOS
  * Force10
-   * DNOS
-   * FTOS
+   * DNOS - dnos
+   * FTOS - ftos
  * FortiGate
-   * FortiOS
+   * FortiOS - fortios
  * HP
-   * Comware (HP A-series, H3C, 3Com)
-   * Procurve
+   * Comware (HP A-series, H3C, 3Com) - comware
+   * Procurve - procurve
  * Huawei
    * VRP
  * Juniper
    * JunOS
    * ScreenOS (Netscreen)
  * Mellanox
-   * MLNX-OS
+   * MLNX-OS - mlnxos
  * Mikrotik
-   * RouterOS
+   * RouterOS - routeros
  * Motorola
    * RFS
  * MRV
-   * MasterOS
+   * MasterOS - masteros
  * Netonix
-   * WISP Switch (As Netonix)
+   * WISP Switch (As Netonix) - netonix
  * Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)
-   * SR OS (TiMOS)
+   * SR OS (TiMOS) - timos
  * Opengear
-   * Opengear
+   * Opengear - opengear
  * Palo Alto
-   * PANOS
- * pfSense
+   * PANOS - panos
+ * pfSense - pfsense
  * Quanta
-   * Quanta / VxWorks 6.6 (1.1.0.8)
+   * Quanta / VxWorks 6.6 (1.1.0.8) - quantaos
  * Supermicro
-   * Supermicro
+   * Supermicro - supermicro
  * Ubiquiti
-   * AirOS
-   * Edgeos
-   * EdgeSwitch
+   * AirOS - airos
+   * Edgeos - edgeos
+   * EdgeSwitch - edgeswitch
  * Watchguard
-   * Fireware OS
+   * Fireware OS - firewareos
  * Zyxel
-   * ZyNOS
+   * ZyNOS - zynos
 
 
 # Installation
diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
deleted file mode 100644
index 3c762de7b..000000000
--- a/lib/oxidized/model/alvarion
+++ /dev/null
@@ -1,13 +0,0 @@
-class Alvarion < Oxidized::Model
-
-  # Used in Alvarion wisp equipment
-
-  # Run this command as an instance of Model so we can access node
-  pre do
-    cmd "#{node.auth[:password]}.cfg"
-  end
-
-
-  cfg :tftp {}
-
-end