diff --git a/Examples/test-suite/exception_classname.i b/Examples/test-suite/exception_classname.i
index 6900581cf..ed8c433eb 100644
--- a/Examples/test-suite/exception_classname.i
+++ b/Examples/test-suite/exception_classname.i
@@ -1,7 +1,7 @@
 %module exception_classname
 
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME);
-#ifdef SWIGPHP
+#if defined(SWIGPHP) || defined(SWIGD)
 %rename(ExceptionClass) Exception;
 #endif
 
diff --git a/Examples/test-suite/java/smart_pointer_ignore_runme.java b/Examples/test-suite/java/smart_pointer_ignore_runme.java
index f02bf536a..d6c90dd4e 100644
--- a/Examples/test-suite/java/smart_pointer_ignore_runme.java
+++ b/Examples/test-suite/java/smart_pointer_ignore_runme.java
@@ -13,7 +13,7 @@ public class smart_pointer_ignore_runme {
 
   public static void main(String argv[]) {
     DerivedPtr d = smart_pointer_ignore.makeDerived();
-    d.base();
-    d.derived();
+    d.baseMethod();
+    d.derivedMethod();
   }
 }
diff --git a/Examples/test-suite/smart_pointer_ignore.i b/Examples/test-suite/smart_pointer_ignore.i
index f369de782..146a5e49e 100644
--- a/Examples/test-suite/smart_pointer_ignore.i
+++ b/Examples/test-suite/smart_pointer_ignore.i
@@ -6,12 +6,12 @@
 %inline %{
 class Base {
   public:
-    void base() {}
+    void baseMethod() {}
 };
 
 class Derived : public Base {
   public:
-    void derived() {}
+    void derivedMethod() {}
 };
 
 template <class T>