diff --git a/endpoints/api/organization.py b/endpoints/api/organization.py
index 849e85c71..1836dcb1f 100644
--- a/endpoints/api/organization.py
+++ b/endpoints/api/organization.py
@@ -224,7 +224,7 @@ class OrgPrivateRepositories(ApiResource):
 
 @resource('/v1/organization/<orgname>/members')
 @path_param('orgname', 'The name of the organization')
-class OrgnaizationMemberList(ApiResource):
+class OrganizationMemberList(ApiResource):
   """ Resource for listing the members of an organization. """
 
   @require_scope(scopes.ORG_ADMIN)
@@ -266,7 +266,7 @@ class OrganizationMember(ApiResource):
   @require_scope(scopes.ORG_ADMIN)
   @nickname('getOrganizationMember')
   def get(self, orgname, membername):
-    """ Get information on the specific orgnaization member. """
+    """ Get information on the specific organization member. """
     permission = AdministerOrganizationPermission(orgname)
     if permission.can():
       try:
diff --git a/test/test_api_security.py b/test/test_api_security.py
index 8c6a42af6..5a9adb92b 100644
--- a/test/test_api_security.py
+++ b/test/test_api_security.py
@@ -32,12 +32,12 @@ from endpoints.api.repotoken import RepositoryToken, RepositoryTokenList
 from endpoints.api.prototype import PermissionPrototype, PermissionPrototypeList
 from endpoints.api.logs import UserLogs, OrgLogs, RepositoryLogs
 from endpoints.api.billing import (UserInvoiceList, UserCard, UserPlan, ListPlans,
-                                   OrgnaizationInvoiceList, OrganizationCard, OrganizationPlan,
+                                   OrganizationInvoiceList, OrganizationCard, OrganizationPlan,
                                    UserInvoiceFieldList, UserInvoiceField,
                                    OrganizationInvoiceFieldList, OrganizationInvoiceField)
 from endpoints.api.discovery import DiscoveryResource
 from endpoints.api.organization import (OrganizationList, OrganizationMember,
-                                        OrgPrivateRepositories, OrgnaizationMemberList,
+                                        OrgPrivateRepositories, OrganizationMemberList,
                                         Organization, ApplicationInformation,
                                         OrganizationApplications, OrganizationApplicationResource,
                                         OrganizationApplicationResetClientSecret)
@@ -2679,10 +2679,10 @@ class TestPermissionPrototypeListBuynlarge(ApiTestCase):
                                              u'delegate': {u'kind': u'user', u'name': '7DGP'}})
 
 
-class TestOrgnaizationInvoiceListBuynlarge(ApiTestCase):
+class TestOrganizationInvoiceListBuynlarge(ApiTestCase):
   def setUp(self):
     ApiTestCase.setUp(self)
-    self._set_url(OrgnaizationInvoiceList, orgname="buynlarge")
+    self._set_url(OrganizationInvoiceList, orgname="buynlarge")
 
   def test_get_anonymous(self):
     self._run_test('GET', 401, None, None)
@@ -2715,10 +2715,10 @@ class TestOrgPrivateRepositoriesBuynlarge(ApiTestCase):
     self._run_test('GET', 200, 'devtable', None)
 
 
-class TestOrgnaizationMemberListBuynlarge(ApiTestCase):
+class TestOrganizationMemberListBuynlarge(ApiTestCase):
   def setUp(self):
     ApiTestCase.setUp(self)
-    self._set_url(OrgnaizationMemberList, orgname="buynlarge")
+    self._set_url(OrganizationMemberList, orgname="buynlarge")
 
   def test_get_anonymous(self):
     self._run_test('GET', 401, None, None)
diff --git a/test/test_api_usage.py b/test/test_api_usage.py
index d72a22123..ca3441043 100644
--- a/test/test_api_usage.py
+++ b/test/test_api_usage.py
@@ -40,7 +40,7 @@ from endpoints.api.billing import (UserCard, UserPlan, ListPlans, OrganizationCa
                                    OrganizationPlan)
 from endpoints.api.discovery import DiscoveryResource
 from endpoints.api.organization import (OrganizationList, OrganizationMember,
-                                        OrgPrivateRepositories, OrgnaizationMemberList,
+                                        OrgPrivateRepositories, OrganizationMemberList,
                                         Organization, ApplicationInformation,
                                         OrganizationApplications, OrganizationApplicationResource,
                                         OrganizationApplicationResetClientSecret)
@@ -806,7 +806,7 @@ class TestGetOrganiaztionMembers(ApiTestCase):
   def test_getmembers(self):
     self.login(ADMIN_ACCESS_USER)
 
-    json = self.getJsonResponse(OrgnaizationMemberList,
+    json = self.getJsonResponse(OrganizationMemberList,
                                 params=dict(orgname=ORGANIZATION))
 
     assert ADMIN_ACCESS_USER in json['members']