diff --git a/Examples/test-suite/csharp/char_strings_runme.cs b/Examples/test-suite/csharp/char_strings_runme.cs
index a1e878016..a8907fb16 100644
--- a/Examples/test-suite/csharp/char_strings_runme.cs
+++ b/Examples/test-suite/csharp/char_strings_runme.cs
@@ -5,7 +5,7 @@ using char_stringsNamespace;
 public class char_strings_runme {
 
   private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
-  private static string OTHERLAND_MSG = "Little message from the the safe world.";
+  private static string OTHERLAND_MSG = "Little message from the safe world.";
 
   public static void Main() {
 
diff --git a/Examples/test-suite/fvirtual.i b/Examples/test-suite/fvirtual.i
index 074202bee..af189ed1f 100644
--- a/Examples/test-suite/fvirtual.i
+++ b/Examples/test-suite/fvirtual.i
@@ -10,11 +10,11 @@
       virtual ~Node() {}
   };
 
-  class Switch : public Node {
+  class NodeSwitch : public Node {
     public :
       virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual
       virtual int addChild( Node *child, bool value ) { return 3; }
-      virtual ~Switch() {}
+      virtual ~NodeSwitch() {}
   };
 %}
 
diff --git a/Examples/test-suite/java/char_strings_runme.java b/Examples/test-suite/java/char_strings_runme.java
index 2e62080f5..2c71d3ea7 100644
--- a/Examples/test-suite/java/char_strings_runme.java
+++ b/Examples/test-suite/java/char_strings_runme.java
@@ -12,7 +12,7 @@ public class char_strings_runme {
   }
 
   private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
-  private static String OTHERLAND_MSG = "Little message from the the safe world.";
+  private static String OTHERLAND_MSG = "Little message from the safe world.";
 
   public static void main(String argv[]) {
 
diff --git a/Examples/test-suite/li_std_string.i b/Examples/test-suite/li_std_string.i
index 8c2f1b857..2d0b7503d 100644
--- a/Examples/test-suite/li_std_string.i
+++ b/Examples/test-suite/li_std_string.i
@@ -129,7 +129,7 @@ public:
 %}
 
 %inline %{
-  std::string empty() {
+  std::string stdstring_empty() {
     return std::string();
   }
 
diff --git a/Examples/test-suite/octave/fvirtual_runme.m b/Examples/test-suite/octave/fvirtual_runme.m
index 06c6e7ccb..e755a559a 100644
--- a/Examples/test-suite/octave/fvirtual_runme.m
+++ b/Examples/test-suite/octave/fvirtual_runme.m
@@ -1,6 +1,6 @@
 fvirtual
 
-sw = Switch();
+sw = NodeSwitch();
 n = Node();
 i = sw.addChild(n);
 
diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_runme.m
index 1c24ac344..fa0e260e0 100644
--- a/Examples/test-suite/octave/li_std_string_runme.m
+++ b/Examples/test-suite/octave/li_std_string_runme.m
@@ -148,7 +148,7 @@ if (s != "hellohello")
 endif
 
 
-if (li_std_string.empty() != "")
+if (li_std_string.stdstring_empty() != "")
   error
 endif
 
diff --git a/Examples/test-suite/perl5/li_std_string_runme.pl b/Examples/test-suite/perl5/li_std_string_runme.pl
index 0ee11bdc7..9ec7dd08c 100644
--- a/Examples/test-suite/perl5/li_std_string_runme.pl
+++ b/Examples/test-suite/perl5/li_std_string_runme.pl
@@ -98,7 +98,7 @@ SKIP: {
 is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number");
 
 
-is(li_std_string::empty(), "", "empty");
+is(li_std_string::stdstring_empty(), "", "stdstring_empty");
 
 is(li_std_string::c_empty(),  "", "c_empty");
 
@@ -110,4 +110,4 @@ is(li_std_string::get_null(li_std_string::c_null()), undef, "c_empty");
 
 is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty");
 
-is(li_std_string::get_null(li_std_string::empty()), "non-null", "c_empty");
+is(li_std_string::get_null(li_std_string::stdstring_empty()), "non-null", "stdstring_empty");
diff --git a/Examples/test-suite/python/fvirtual_runme.py b/Examples/test-suite/python/fvirtual_runme.py
index e06ab5b4f..ada3313de 100644
--- a/Examples/test-suite/python/fvirtual_runme.py
+++ b/Examples/test-suite/python/fvirtual_runme.py
@@ -1,6 +1,6 @@
 from fvirtual import *
 
-sw = Switch()
+sw = NodeSwitch()
 n = Node()
 i = sw.addChild(n);
 
diff --git a/Examples/test-suite/python/li_std_string_runme.py b/Examples/test-suite/python/li_std_string_runme.py
index ed79718d2..c0dae1e25 100644
--- a/Examples/test-suite/python/li_std_string_runme.py
+++ b/Examples/test-suite/python/li_std_string_runme.py
@@ -121,7 +121,7 @@ if s != "hellohello":
   raise RuntimeError
 
 
-if li_std_string.empty() != "":
+if li_std_string.stdstring_empty() != "":
   raise RuntimeError
   
 
diff --git a/Examples/test-suite/ruby/li_std_string_runme.rb b/Examples/test-suite/ruby/li_std_string_runme.rb
index f572573bc..dc85b5dab 100644
--- a/Examples/test-suite/ruby/li_std_string_runme.rb
+++ b/Examples/test-suite/ruby/li_std_string_runme.rb
@@ -124,7 +124,7 @@ if (s != "hellohello")
 end
 
 
-if (empty() != "")
+if (stdstring_empty() != "")
   raise RuntimeError
 end
 
diff --git a/Examples/test-suite/template_int_const.i b/Examples/test-suite/template_int_const.i
index 37b1cf998..e69a53c4f 100644
--- a/Examples/test-suite/template_int_const.i
+++ b/Examples/test-suite/template_int_const.i
@@ -10,7 +10,7 @@
     static const Polarization polarization = UnaryPolarization; 
   }; 
   template <Polarization P> 
-    struct Interface 
+    struct Interface_
     { 
     }; 
  
@@ -26,16 +26,16 @@
     }; 
 %} 
  
-%template(Interface_UP) Interface<UnaryPolarization>; 
+%template(Interface_UP) Interface_<UnaryPolarization>; 
 %template(Module_1) Module<1>; 
  
 %inline %{ 
   struct ExtInterface1 :  
-    Interface<UnaryPolarization> // works 
+    Interface_<UnaryPolarization> // works 
   { 
   }; 
   struct ExtInterface2 : 
-    Interface<interface_traits::polarization>  // doesn't work 
+    Interface_<interface_traits::polarization>  // doesn't work 
   { 
   }; 
   struct ExtModule1 : 
diff --git a/Examples/test-suite/template_typedef_rec.i b/Examples/test-suite/template_typedef_rec.i
index 83fe2104a..abdf11382 100644
--- a/Examples/test-suite/template_typedef_rec.i
+++ b/Examples/test-suite/template_typedef_rec.i
@@ -16,7 +16,7 @@ public:
 
 
 template <typename T>
-class ArrayIterator
+class ArrayIterator_
 {
  public:
   typedef test_Array::intT    intT;
@@ -38,8 +38,8 @@ class ArrayPrimitiveT
 public:
   typedef T  ValueT;
   typedef T  valueT;
-  typedef ArrayIterator<T>       Iterator;
-  typedef ArrayIterator<const T> ConstIterator;  
+  typedef ArrayIterator_<T>       Iterator;
+  typedef ArrayIterator_<const T> ConstIterator;  
   typedef ArrayReverseIterator<T>       ReverseIterator;
   typedef ArrayReverseIterator<const T> ConstReverseIterator;
 };