diff --git a/Python/codecs.c b/Python/codecs.c
index 7e3ff8a..cd6b7f0 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -751,7 +751,7 @@
 /* This handler is declared static until someone demonstrates
    a need to call it directly. */
 static PyObject *
-PyCodec_SurrogateErrors(PyObject *exc)
+PyCodec_SurrogatePassErrors(PyObject *exc)
 {
     PyObject *restuple;
     PyObject *object;
@@ -935,9 +935,9 @@
     return PyCodec_BackslashReplaceErrors(exc);
 }
 
-static PyObject *surrogates_errors(PyObject *self, PyObject *exc)
+static PyObject *surrogatepass_errors(PyObject *self, PyObject *exc)
 {
-    return PyCodec_SurrogateErrors(exc);
+    return PyCodec_SurrogatePassErrors(exc);
 }
 
 static PyObject *utf8b_errors(PyObject *self, PyObject *exc)
@@ -993,10 +993,10 @@
 	    }
 	},
 	{
-	    "surrogates",
+	    "surrogatepass",
 	    {
-		"surrogates",
-		surrogates_errors,
+		"surrogatepass",
+		surrogatepass_errors,
 		METH_O
 	    }
 	},
diff --git a/Python/marshal.c b/Python/marshal.c
index 4e9c129..19d445a 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -314,7 +314,7 @@
 	        PyObject *utf8;
 		utf8 = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(v),
 					    PyUnicode_GET_SIZE(v),
-					    "surrogates");
+					    "surrogatepass");
 		if (utf8 == NULL) {
 			p->depth--;
 			p->error = WFERR_UNMARSHALLABLE;
@@ -809,7 +809,7 @@
 			retval = NULL;
 			break;
 		}
-		v = PyUnicode_DecodeUTF8(buffer, n, "surrogates");
+		v = PyUnicode_DecodeUTF8(buffer, n, "surrogatepass");
 		PyMem_DEL(buffer);
 		retval = v;
 		break;