diff --git a/mogan/api/controllers/v1/__init__.py b/mogan/api/controllers/v1/__init__.py
index d9409f5e..9fb667f0 100644
--- a/mogan/api/controllers/v1/__init__.py
+++ b/mogan/api/controllers/v1/__init__.py
@@ -26,7 +26,7 @@ from wsme import types as wtypes
 from mogan.api.controllers import base
 from mogan.api.controllers import link
 from mogan.api.controllers.v1 import aggregates
-from mogan.api.controllers.v1 import availability_zone
+from mogan.api.controllers.v1 import availability_zones
 from mogan.api.controllers.v1 import flavors
 from mogan.api.controllers.v1 import keypairs
 from mogan.api.controllers.v1 import nodes
@@ -116,7 +116,7 @@ class Controller(rest.RestController):
 
     flavors = flavors.FlavorsController()
     servers = servers.ServerController()
-    availability_zones = availability_zone.AvailabilityZoneController()
+    availability_zones = availability_zones.AvailabilityZoneController()
     keypairs = keypairs.KeyPairController()
     aggregates = aggregates.AggregateController()
     nodes = nodes.NodeController()
diff --git a/mogan/api/controllers/v1/availability_zone.py b/mogan/api/controllers/v1/availability_zones.py
similarity index 100%
rename from mogan/api/controllers/v1/availability_zone.py
rename to mogan/api/controllers/v1/availability_zones.py
diff --git a/mogan/objects/__init__.py b/mogan/objects/__init__.py
index 22e872a2..d95efce0 100644
--- a/mogan/objects/__init__.py
+++ b/mogan/objects/__init__.py
@@ -27,7 +27,7 @@ def register_all():
     # need to receive it via RPC.
     __import__('mogan.objects.flavor')
     __import__('mogan.objects.server')
-    __import__('mogan.objects.server_nics')
+    __import__('mogan.objects.server_nic')
     __import__('mogan.objects.server_fault')
     __import__('mogan.objects.keypair')
     __import__('mogan.objects.aggregate')
diff --git a/mogan/objects/server_nics.py b/mogan/objects/server_nic.py
similarity index 100%
rename from mogan/objects/server_nics.py
rename to mogan/objects/server_nic.py