diff --git a/bin/netjsonconfig b/bin/netjsonconfig
index d62efbe07..2062eed72 100644
--- a/bin/netjsonconfig
+++ b/bin/netjsonconfig
@@ -170,7 +170,7 @@ backends = {
     'openwrt': netjsonconfig.OpenWrt,
     'openwisp': netjsonconfig.OpenWisp,
     'openvpn': netjsonconfig.OpenVpn,
-    'airos': netjsonconfig.AirOS,
+    'airos': netjsonconfig.AirOs,
 }
 
 backend_class = backends[args.backend]
diff --git a/netjsonconfig/__init__.py b/netjsonconfig/__init__.py
index c068fdda6..d116bfe73 100644
--- a/netjsonconfig/__init__.py
+++ b/netjsonconfig/__init__.py
@@ -3,4 +3,4 @@
 from .backends.openwrt.openwrt import OpenWrt  # noqa
 from .backends.openwisp.openwisp import OpenWisp  # noqa
 from .backends.openvpn.openvpn import OpenVpn  # noqa
-from .backends.airos.airos import AirOS  # noqa
+from .backends.airos.airos import AirOs  # noqa
diff --git a/netjsonconfig/backends/airos/airos.py b/netjsonconfig/backends/airos/airos.py
index 391b41f28..c0e723022 100644
--- a/netjsonconfig/backends/airos/airos.py
+++ b/netjsonconfig/backends/airos/airos.py
@@ -4,12 +4,12 @@
         Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
         Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
         Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
-from .renderers import AirOS
+from .renderers import AirOS as AirOsRenderer
 from ..base.backend import BaseBackend
 from .schema import schema
 
 
-class AirOS(BaseBackend):
+class AirOs(BaseBackend):
     """
     AirOS backend
     """
@@ -52,10 +52,10 @@ class AirOS(BaseBackend):
     # templates lives
     env_path = 'netjsonconfig.backends.airos'
 
-    renderer = AirOS
+    renderer = AirOsRenderer
 
     def to_intermediate(self):
-        super(AirOS, self).to_intermediate()
+        super(AirOs, self).to_intermediate()
         for k, v in self.intermediate_data.items():
             self.intermediate_data[k] = [x for x in flatten(intermediate_to_list(v)) if x != {}]
 
diff --git a/tests/airos/dummy.py b/tests/airos/dummy.py
index e539982a6..bdc326dad 100644
--- a/tests/airos/dummy.py
+++ b/tests/airos/dummy.py
@@ -1,6 +1,6 @@
-from netjsonconfig import AirOS
+from netjsonconfig import AirOs
 
-from netjsoncongig.backends.airos.converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
+from netjsonconfig.backends.airos.converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
         Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
         Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
         Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
@@ -33,7 +33,7 @@ def assertEqualConfig(self, a, b):
             self.assertEqual(a, b)
 
 
-class AaaAirOS(AirOS):
+class AaaAirOs(AirOs):
     """
     Mock backend with converter for radius authentication
     """
@@ -42,7 +42,7 @@ class AaaAirOS(AirOS):
     ]
 
 
-class BridgeAirOS(AirOS):
+class BridgeAirOs(AirOs):
     """
     Mock backend with converter for bridge interface
     """
@@ -51,7 +51,7 @@ class BridgeAirOS(AirOS):
     ]
 
 
-class DiscoveryAirOS(AirOS):
+class DiscoveryAirOs(AirOs):
     """
     Mock backend with converter for network hardware discovery
     """
@@ -60,7 +60,7 @@ class DiscoveryAirOS(AirOS):
     ]
 
 
-class DyndnsAirOS(AirOS):
+class DyndnsAirOs(AirOs):
     """
     Mock backend with converter for dynamic dns capabilities
     """
@@ -69,7 +69,7 @@ class DyndnsAirOS(AirOS):
     ]
 
 
-class EbtablesAirOS(AirOS):
+class EbtablesAirOs(AirOs):
     """
     Mock backend with converter for ebtables
     """
@@ -78,7 +78,7 @@ class EbtablesAirOS(AirOS):
     ]
 
 
-class GuiAirOS(AirOS):
+class GuiAirOs(AirOs):
     """
     Mock backend with converter for web interface settings
     """
@@ -87,7 +87,7 @@ class GuiAirOS(AirOS):
     ]
 
 
-class HttpdAirOS(AirOS):
+class HttpdAirOs(AirOs):
     """
     Mock backend with converter for web server
     """
@@ -96,7 +96,7 @@ class HttpdAirOS(AirOS):
     ]
 
 
-class Igmpproxy(AirOS):
+class Igmpproxy(AirOs):
     """
     Mock backend with converter for igmpproxy
     """
@@ -105,7 +105,7 @@ class Igmpproxy(AirOS):
     ]
 
 
-class IptablesAirOS(AirOS):
+class IptablesAirOs(AirOs):
     """
     Mock backend with converter for iptables
     """
@@ -114,7 +114,7 @@ class IptablesAirOS(AirOS):
     ]
 
 
-class NetconfAirOS(AirOS):
+class NetconfAirOs(AirOs):
     """
     Mock backend with converter for network configuration
     """
@@ -123,7 +123,7 @@ class NetconfAirOS(AirOS):
     ]
 
 
-class NetmodeAirOS(AirOS):
+class NetmodeAirOs(AirOs):
     """
     Mock backend with converter for network mode
     """
@@ -132,7 +132,7 @@ class NetmodeAirOS(AirOS):
     ]
 
 
-class NtpclientAirOS(AirOS):
+class NtpclientAirOs(AirOs):
     """
     Mock backend with converter for ntp settings
     """
@@ -141,7 +141,7 @@ class NtpclientAirOS(AirOS):
     ]
 
 
-class PwdogAirOS(AirOS):
+class PwdogAirOs(AirOs):
     """
     Mock backend with converter for ping watchdog settings
     """
@@ -150,7 +150,7 @@ class PwdogAirOS(AirOS):
     ]
 
 
-class RadioAirOS(AirOS):
+class RadioAirOs(AirOs):
     """
     Mock backend with converter for radio settings
     """
@@ -159,7 +159,7 @@ class RadioAirOS(AirOS):
     ]
 
 
-class ResolvAirOS(AirOS):
+class ResolvAirOs(AirOs):
     """
     Mock backend with converter for network resolver
     """
@@ -168,7 +168,7 @@ class ResolvAirOS(AirOS):
     ]
 
 
-class RouteAirOS(AirOS):
+class RouteAirOs(AirOs):
     """
     Mock backend with converter for static routes
     """
@@ -177,7 +177,7 @@ class RouteAirOS(AirOS):
     ]
 
 
-class SnmpAirOS(AirOS):
+class SnmpAirOs(AirOs):
     """
     Mock backend with converter for simple network management protocol
     """
@@ -187,7 +187,7 @@ class SnmpAirOS(AirOS):
 
 
 
-class SshdAirOS(AirOS):
+class SshdAirOs(AirOs):
     """
     Mock backend with converter for ssh daemon settings
     """
@@ -196,7 +196,7 @@ class SshdAirOS(AirOS):
     ]
 
 
-class SyslogAirOS(AirOS):
+class SyslogAirOs(AirOs):
     """
     Mock backend with converter for remote logging
     """
@@ -205,7 +205,7 @@ class SyslogAirOS(AirOS):
     ]
 
 
-class SystemAirOS(AirOS):
+class SystemAirOs(AirOs):
     """
     Mock backend with converter for system settings
     """
@@ -214,7 +214,7 @@ class SystemAirOS(AirOS):
     ]
 
 
-class TelnetdAirOS(AirOS):
+class TelnetdAirOs(AirOs):
     """
     Mock backend with converter for telnet daemon settings
     """
@@ -223,7 +223,7 @@ class TelnetdAirOS(AirOS):
     ]
 
 
-class UpdateAirOS(AirOS):
+class UpdateAirOs(AirOs):
     """
     Mock backend with converter for update
     """
@@ -232,7 +232,7 @@ class UpdateAirOS(AirOS):
     ]
 
 
-class UsersAirOS(AirOS):
+class UsersAirOs(AirOs):
     """
     Mock backend with converter for users settings
     """
@@ -241,7 +241,7 @@ class UsersAirOS(AirOS):
     ]
 
 
-class VlanAirOS(AirOS):
+class VlanAirOs(AirOs):
     """
     Mock backend with converter for vlan settings
     """
@@ -250,7 +250,7 @@ class VlanAirOS(AirOS):
     ]
 
 
-class WirelessAirOS(AirOS):
+class WirelessAirOs(AirOs):
     """
     Mock backend with converter for wireless settings
     """
@@ -259,7 +259,7 @@ class WirelessAirOS(AirOS):
     ]
 
 
-class WpasupplicantAirOS(AirOS):
+class WpasupplicantAirOs(AirOs):
     """
     Mock backend with converter for wpasupplicant settings
     """
diff --git a/tests/airos/test_aaa.py b/tests/airos/test_aaa.py
index c5d4db7b0..6fe81e50a 100644
--- a/tests/airos/test_aaa.py
+++ b/tests/airos/test_aaa.py
@@ -1,9 +1,9 @@
-from .dummy import AaaAirOS, ConverterTest
+from .dummy import AaaAirOs, ConverterTest
 
 
 class TestResolvConverter(ConverterTest):
 
-    backend = AaaAirOS
+    backend = AaaAirOs
 
     def test_aaa_key(self):
         o = self.backend({
diff --git a/tests/airos/test_bridge.py b/tests/airos/test_bridge.py
index 2ca0c717d..940b225bf 100644
--- a/tests/airos/test_bridge.py
+++ b/tests/airos/test_bridge.py
@@ -1,11 +1,11 @@
-from .dummy import BridgeAirOS, ConverterTest
+from .dummy import BridgeAirOs, ConverterTest
 
 
 class TestBridgeConverter(ConverterTest):
     """
     tests for backends.airos.renderers.SystemRenderer
     """
-    backend = BridgeAirOS
+    backend = BridgeAirOs
 
     def test_active_bridge(self):
 
diff --git a/tests/airos/test_discovery.py b/tests/airos/test_discovery.py
index 48812f03b..585b504a9 100644
--- a/tests/airos/test_discovery.py
+++ b/tests/airos/test_discovery.py
@@ -1,9 +1,9 @@
-from .dummy import DiscoveryAirOS, ConverterTest
+from .dummy import DiscoveryAirOs, ConverterTest
 
 
 class TestDiscoveryConverter(ConverterTest):
 
-    backend = DiscoveryAirOS
+    backend = DiscoveryAirOs
 
     def test_discovery_key(self):
         o = self.backend({
diff --git a/tests/airos/test_dyndns.py b/tests/airos/test_dyndns.py
index 2c8148d5f..bca2c00ad 100644
--- a/tests/airos/test_dyndns.py
+++ b/tests/airos/test_dyndns.py
@@ -1,9 +1,9 @@
-from .dummy import DyndnsAirOS, ConverterTest
+from .dummy import DyndnsAirOs, ConverterTest
 
 
 class TestDyndnsConverter(ConverterTest):
 
-    backend = DyndnsAirOS
+    backend = DyndnsAirOs
 
     def test_Dyndns_key(self):
         o = self.backend({
diff --git a/tests/airos/test_gui.py b/tests/airos/test_gui.py
index 43c718eaf..97ca0fe4c 100644
--- a/tests/airos/test_gui.py
+++ b/tests/airos/test_gui.py
@@ -1,9 +1,9 @@
-from .dummy import GuiAirOS, ConverterTest
+from .dummy import GuiAirOs, ConverterTest
 
 
 class TestGuiConverter(ConverterTest):
 
-    backend = GuiAirOS
+    backend = GuiAirOs
 
     def test_gui_key(self):
         o = self.backend({
diff --git a/tests/airos/test_httpd.py b/tests/airos/test_httpd.py
index 4e0b6696e..cb2883c61 100644
--- a/tests/airos/test_httpd.py
+++ b/tests/airos/test_httpd.py
@@ -1,9 +1,9 @@
-from .dummy import HttpdAirOS, ConverterTest
+from .dummy import HttpdAirOs, ConverterTest
 
 
 class TestHttpdConverter(ConverterTest):
 
-    backend = HttpdAirOS
+    backend = HttpdAirOs
 
     def test_httpd_key(self):
         o = self.backend({
diff --git a/tests/airos/test_netconf.py b/tests/airos/test_netconf.py
index c884fbc15..75c07b70d 100644
--- a/tests/airos/test_netconf.py
+++ b/tests/airos/test_netconf.py
@@ -1,10 +1,10 @@
 from unittest import skip
-from .dummy import NetconfAirOS, ConverterTest
+from .dummy import NetconfAirOs, ConverterTest
 
 
 class TestNetconfConverter(ConverterTest):
 
-    backend = NetconfAirOS
+    backend = NetconfAirOs
 
     def test_netconf_key(self):
         o = self.backend({
diff --git a/tests/airos/test_netmode.py b/tests/airos/test_netmode.py
index c7579456e..2b6ee7351 100644
--- a/tests/airos/test_netmode.py
+++ b/tests/airos/test_netmode.py
@@ -1,9 +1,9 @@
-from .dummy import NetmodeAirOS, ConverterTest
+from .dummy import NetmodeAirOs, ConverterTest
 
 
 class TestNetmodeConverter(ConverterTest):
 
-    backend = NetmodeAirOS
+    backend = NetmodeAirOs
 
     def test_netconf_key(self):
         o = self.backend({
diff --git a/tests/airos/test_ntp.py b/tests/airos/test_ntp.py
index 433d07200..7c4ecf695 100644
--- a/tests/airos/test_ntp.py
+++ b/tests/airos/test_ntp.py
@@ -1,9 +1,9 @@
-from .dummy import NtpclientAirOS, ConverterTest
+from .dummy import NtpclientAirOs, ConverterTest
 
 
 class TestResolvConverter(ConverterTest):
 
-    backend = NtpclientAirOS
+    backend = NtpclientAirOs
 
     def test_ntp_key(self):
         o = self.backend({
diff --git a/tests/airos/test_pwdog.py b/tests/airos/test_pwdog.py
index 0002b8cdf..323e5ed1f 100644
--- a/tests/airos/test_pwdog.py
+++ b/tests/airos/test_pwdog.py
@@ -1,9 +1,9 @@
-from .dummy import PwdogAirOS, ConverterTest
+from .dummy import PwdogAirOs, ConverterTest
 
 
 class TestPwdogConverter(ConverterTest):
 
-    backend = PwdogAirOS
+    backend = PwdogAirOs
 
     def test_ntp_key(self):
         o = self.backend({
diff --git a/tests/airos/test_radio.py b/tests/airos/test_radio.py
index fd62570a7..0c95d3390 100644
--- a/tests/airos/test_radio.py
+++ b/tests/airos/test_radio.py
@@ -1,9 +1,9 @@
-from .dummy import RadioAirOS, ConverterTest
+from .dummy import RadioAirOs, ConverterTest
 
 
 class TestRadioConverter(ConverterTest):
 
-    backend = RadioAirOS
+    backend = RadioAirOs
 
     def test_no_radio(self):
         o = self.backend({
diff --git a/tests/airos/test_resolv.py b/tests/airos/test_resolv.py
index 3e1ee86a6..17b491ebb 100644
--- a/tests/airos/test_resolv.py
+++ b/tests/airos/test_resolv.py
@@ -1,9 +1,9 @@
-from .dummy import ResolvAirOS, ConverterTest
+from .dummy import ResolvAirOs, ConverterTest
 
 
 class TestResolvConverter(ConverterTest):
 
-    backend = ResolvAirOS
+    backend = ResolvAirOs
 
     def test_resolv(self):
         o = self.backend({
diff --git a/tests/airos/test_vlan.py b/tests/airos/test_vlan.py
index 935bf0003..f67c223d8 100644
--- a/tests/airos/test_vlan.py
+++ b/tests/airos/test_vlan.py
@@ -1,11 +1,11 @@
-from .dummy import VlanAirOS, ConverterTest
+from .dummy import VlanAirOs, ConverterTest
 
 
 class TestVlanConverter(ConverterTest):
     """
     tests for backends.airos.renderers.SystemRenderer
     """
-    backend = VlanAirOS
+    backend = VlanAirOs
 
     def test_active_vlan(self):
 
diff --git a/tests/airos/test_wireless.py b/tests/airos/test_wireless.py
index 12663234f..774250c96 100644
--- a/tests/airos/test_wireless.py
+++ b/tests/airos/test_wireless.py
@@ -1,9 +1,9 @@
-from .dummy import WirelessAirOS, ConverterTest
+from .dummy import WirelessAirOs, ConverterTest
 
 
 class TestWirelessConverter(ConverterTest):
 
-    backend = WirelessAirOS
+    backend = WirelessAirOs
 
     def test_active_wireless(self):
 
diff --git a/tests/airos/test_wpasupplicant.py b/tests/airos/test_wpasupplicant.py
index 502e5d636..d00e04c1a 100644
--- a/tests/airos/test_wpasupplicant.py
+++ b/tests/airos/test_wpasupplicant.py
@@ -2,7 +2,7 @@
 
 from netjsonconfig.exceptions import ValidationError
 
-from .dummy import WpasupplicantAirOS, ConverterTest
+from .dummy import WpasupplicantAirOs, ConverterTest
 
 
 class TestWpasupplicantStation(ConverterTest):
@@ -10,7 +10,7 @@ class TestWpasupplicantStation(ConverterTest):
     Test the wpasupplicant converter for a
     device in ``station`` mode
     """
-    backend = WpasupplicantAirOS
+    backend = WpasupplicantAirOs
 
     def test_invalid_encryption(self):
 
@@ -199,7 +199,7 @@ class TestWpasupplicantAccess(ConverterTest):
     device in ``access_point`` mode
     """
 
-    backend = WpasupplicantAirOS
+    backend = WpasupplicantAirOs
 
     def test_no_encryption(self):