diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py
index 8d67655c59..d8d3ced4a9 100644
--- a/swift/common/middleware/swift3.py
+++ b/swift/common/middleware/swift3.py
@@ -240,7 +240,7 @@ class BucketController(Controller):
             if status == 401:
                 return get_err_response('AccessDenied')
             elif status == 404:
-                return get_err_response('InvalidBucketName')
+                return get_err_response('NoSuchBucket')
             else:
                 return get_err_response('InvalidURI')
 
@@ -311,7 +311,7 @@ class BucketController(Controller):
             if status == 401:
                 return get_err_response('AccessDenied')
             elif status == 404:
-                return get_err_response('InvalidBucketName')
+                return get_err_response('NoSuchBucket')
             elif status == 409:
                 return get_err_response('BucketNotEmpty')
             else:
@@ -397,7 +397,7 @@ class ObjectController(Controller):
             if status == 401:
                 return get_err_response('AccessDenied')
             elif status == 404:
-                return get_err_response('InvalidBucketName')
+                return get_err_response('NoSuchBucket')
             else:
                 return get_err_response('InvalidURI')
 
diff --git a/test/unit/common/middleware/test_swift3.py b/test/unit/common/middleware/test_swift3.py
index da49413310..0c31df3a5b 100644
--- a/test/unit/common/middleware/test_swift3.py
+++ b/test/unit/common/middleware/test_swift3.py
@@ -261,7 +261,7 @@ class TestSwift3(unittest.TestCase):
         code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 401)
         self.assertEquals(code, 'AccessDenied')
         code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 404)
-        self.assertEquals(code, 'InvalidBucketName')
+        self.assertEquals(code, 'NoSuchBucket')
         code = self._test_method_error(FakeAppBucket, 'GET', '/bucket', 0)
         self.assertEquals(code, 'InvalidURI')
 
@@ -394,7 +394,7 @@ class TestSwift3(unittest.TestCase):
         code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 401)
         self.assertEquals(code, 'AccessDenied')
         code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 404)
-        self.assertEquals(code, 'InvalidBucketName')
+        self.assertEquals(code, 'NoSuchBucket')
         code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 409)
         self.assertEquals(code, 'BucketNotEmpty')
         code = self._test_method_error(FakeAppBucket, 'DELETE', '/bucket', 0)
@@ -470,7 +470,7 @@ class TestSwift3(unittest.TestCase):
         self.assertEquals(code, 'AccessDenied')
         code = self._test_method_error(FakeAppObject, 'PUT',
                                        '/bucket/object', 404)
-        self.assertEquals(code, 'InvalidBucketName')
+        self.assertEquals(code, 'NoSuchBucket')
         code = self._test_method_error(FakeAppObject, 'PUT',
                                        '/bucket/object', 0)
         self.assertEquals(code, 'InvalidURI')