diff --git a/Examples/test-suite/errors/c_class.stderr b/Examples/test-suite/errors/c_class.stderr
index 388091799..306e144e5 100644
--- a/Examples/test-suite/errors/c_class.stderr
+++ b/Examples/test-suite/errors/c_class.stderr
@@ -1,2 +1,2 @@
 c_class.i:3: Warning 301: class keyword used, but not in C++ mode.
-c_class.i:3: Warning 314: 'class' is a python keyword: renaming 'class' to '_class'
+c_class.i:3: Warning 314: 'class' is a python keyword, renaming to '_class'
diff --git a/Examples/test-suite/errors/cpp_namewarn.stderr b/Examples/test-suite/errors/cpp_namewarn.stderr
index 53c5cdb9c..7cc640e28 100644
--- a/Examples/test-suite/errors/cpp_namewarn.stderr
+++ b/Examples/test-suite/errors/cpp_namewarn.stderr
@@ -1,10 +1,10 @@
-cpp_namewarn.i:58: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
-cpp_namewarn.i:59: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
-cpp_namewarn.i:60: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
-cpp_namewarn.i:65: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
-cpp_namewarn.i:66: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
-cpp_namewarn.i:67: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
-cpp_namewarn.i:72: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
-cpp_namewarn.i:73: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
-cpp_namewarn.i:74: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
+cpp_namewarn.i:58: Warning 314: 'key1' is a keyword, renaming to '_key1'
+cpp_namewarn.i:59: Warning 314: 'key2' is a keyword, renaming to '_key2'
+cpp_namewarn.i:60: Warning 314: 'key3' is a keyword, renaming to '_key3'
+cpp_namewarn.i:65: Warning 314: 'key1' is a keyword, renaming to '_key1'
+cpp_namewarn.i:66: Warning 314: 'key2' is a keyword, renaming to '_key2'
+cpp_namewarn.i:67: Warning 314: 'key3' is a keyword, renaming to '_key3'
+cpp_namewarn.i:72: Warning 314: 'key1' is a keyword, renaming to '_key1'
+cpp_namewarn.i:73: Warning 314: 'key2' is a keyword, renaming to '_key2'
+cpp_namewarn.i:74: Warning 314: 'key3' is a keyword, renaming to '_key3'
 cpp_namewarn.i:80: Warning 314: 'key5' is a keyword
diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index ed66b5ecf..89f176303 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -1521,7 +1521,7 @@ String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname,
 	    if (Strcmp(result, "$ignore") == 0) {
 	      suffix = NewStringf(": ignoring '%s'\n", name);
 	    } else if (Strcmp(result, name) != 0) {
-	      suffix = NewStringf(": renaming '%s' to '%s'\n", name, result);
+	      suffix = NewStringf(", renaming to '%s'\n", result);
 	    } else {
 	      /* No rename was performed */
 	      suffix = NewString("\n");