diff --git a/Examples/test-suite/java/cpp_typedef_runme.java b/Examples/test-suite/java/cpp_typedef_runme.java
index ef477d345..75bb47447 100644
--- a/Examples/test-suite/java/cpp_typedef_runme.java
+++ b/Examples/test-suite/java/cpp_typedef_runme.java
@@ -1,5 +1,5 @@
 
-// This is the cpp_typedef runtime testcase. It checks that shadow classes are
+// This is the cpp_typedef runtime testcase. It checks that proxy classes are
 // generated for typedef'd types.
 
 import cpp_typedef.*;
diff --git a/Examples/test-suite/java/template_classes_runme.java b/Examples/test-suite/java/template_classes_runme.java
index d81f7988d..48f12cb7a 100644
--- a/Examples/test-suite/java/template_classes_runme.java
+++ b/Examples/test-suite/java/template_classes_runme.java
@@ -1,6 +1,6 @@
 
 // This is the template_classes runtime testcase. It checks that SWIG handles a templated 
-// class used by another templated class, in particular that the shadow classes can be used.
+// class used by another templated class, in particular that the proxy classes can be used.
 
 import template_classes.*;
 
diff --git a/Examples/test-suite/kind.i b/Examples/test-suite/kind.i
index 1ced522a2..15727fdeb 100644
--- a/Examples/test-suite/kind.i
+++ b/Examples/test-suite/kind.i
@@ -1,6 +1,6 @@
 /* 
  * This interface file tests whether the language modules handle the kind when declared 
- * with the function/member name, especially when used with shadow classes.
+ * with the function/member name, especially when used with proxy classes.
 */
 
 %module kind
diff --git a/Examples/test-suite/r/double_delete_runme.R b/Examples/test-suite/r/double_delete_runme.R
index 789692dfe..f1e3b00c8 100644
--- a/Examples/test-suite/r/double_delete_runme.R
+++ b/Examples/test-suite/r/double_delete_runme.R
@@ -1,4 +1,4 @@
-# This file illustrates the shadow-class C++ interface generated
+# This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
 dyn.load('double_delete_wrap.so')
@@ -9,4 +9,4 @@ cacheMetaData(1)
 
 f <- Foo(2.0)
 delete(f);
-delete(f);
\ No newline at end of file
+delete(f);
diff --git a/Lib/python/defarg.swg b/Lib/python/defarg.swg
index 2e0a623de..10c991615 100644
--- a/Lib/python/defarg.swg
+++ b/Lib/python/defarg.swg
@@ -1,11 +1,11 @@
 /* This file defines an internal function for processing default arguments
-   with shadow classes.
+   with proxy classes.
 
-   There seems to be no straightforward way to write a shadow functions
+   There seems to be no straightforward way to write proxy functions
    involving default arguments. For example :
 
              def foo(arg1,arg2,*args):
-                     shadowc.foo(arg1,arg2,args)
+                     proxyc.foo(arg1,arg2,args)
 
    This fails because args is now a tuple and SWIG doesn't know what to
    do with it.
@@ -13,7 +13,7 @@
    This file allows a different approach :
 
             def foo(arg1,arg2,*args):
-                    shadowc.__call_defarg(shadowc.foo,(arg1,arg2,)+args)
+                    proxyc.__call_defarg(proxyc.foo,(arg1,arg2,)+args)
 
    Basically, we form a new tuple from the object, call this special
    __call_defarg method and it passes control to the real wrapper function.