diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 37d8b65..4a9cc50 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3840,21 +3840,21 @@
     p = Proxy(obj)
     vereq(C.__dict__["f"](p), "B.f->C.f")
 
-def verrecarlo():
+def carloverre():
     if verbose:
-        print "Testing prohibition of Verre Carlo's hack..."
+        print "Testing prohibition of Carlo Verre's hack..."
     try:
         object.__setattr__(str, "foo", 42)
     except TypeError:
         pass
     else:
-        raise TestFailed, "Verre Carlo __setattr__ suceeded!"
+        raise TestFailed, "Carlo Verre __setattr__ suceeded!"
     try:
         object.__delattr__(str, "lower")
     except TypeError:
         pass
     else:
-        raise TestFailed, "Verre Carlo __delattr__ succeeded!"
+        raise TestFailed, "Carlo Verre __delattr__ succeeded!"
 
 
 def test_main():
@@ -3945,7 +3945,7 @@
     meth_class_get()
     isinst_isclass()
     proxysuper()
-    verrecarlo()
+    carloverre()
 
     if verbose: print "All OK"
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 91c40b9..6ef5f75 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3575,7 +3575,7 @@
 }
 
 /* Helper to check for object.__setattr__ or __delattr__ applied to a type.
-   This is called the Verre Carlo hack after its discoverer. */
+   This is called the Carlo Verre hack after its discoverer. */
 static int
 hackcheck(PyObject *self, setattrofunc func, char *what)
 {