diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 96c7526b8..56097abd9 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -292,7 +292,7 @@ CPP_TEST_CASES += \
 	smart_pointer_templatevariables \
 	smart_pointer_typedef \
 	special_variables \
-	special_variable_functions \
+	special_variable_macros \
 	static_array_member \
 	static_const_member \
 	static_const_member_2 \
diff --git a/Examples/test-suite/csharp/special_variable_functions_runme.cs b/Examples/test-suite/csharp/special_variable_macros_runme.cs
similarity index 53%
rename from Examples/test-suite/csharp/special_variable_functions_runme.cs
rename to Examples/test-suite/csharp/special_variable_macros_runme.cs
index 02d4995d2..abde0053b 100644
--- a/Examples/test-suite/csharp/special_variable_functions_runme.cs
+++ b/Examples/test-suite/csharp/special_variable_macros_runme.cs
@@ -1,16 +1,16 @@
 using System;
-using special_variable_functionsNamespace;
+using special_variable_macrosNamespace;
 
 public class runme {
   static void Main() {
     Name name = new Name();
-    if (special_variable_functions.testFred(name) != "none")
+    if (special_variable_macros.testFred(name) != "none")
       throw new Exception("test failed");
-    if (special_variable_functions.testJack(name) != "$specialname")
+    if (special_variable_macros.testJack(name) != "$specialname")
       throw new Exception("test failed");
-    if (special_variable_functions.testJill(name) != "jilly")
+    if (special_variable_macros.testJill(name) != "jilly")
       throw new Exception("test failed");
-    if (special_variable_functions.testMary(name) != "SWIGTYPE_p_NameWrap")
+    if (special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap")
       throw new Exception("test failed");
     NewName newName = NewName.factory("factoryname");
     name = newName.getStoredName();
diff --git a/Examples/test-suite/java/special_variable_functions_runme.java b/Examples/test-suite/java/special_variable_macros_runme.java
similarity index 58%
rename from Examples/test-suite/java/special_variable_functions_runme.java
rename to Examples/test-suite/java/special_variable_macros_runme.java
index b4d259932..df7aa8c84 100644
--- a/Examples/test-suite/java/special_variable_functions_runme.java
+++ b/Examples/test-suite/java/special_variable_macros_runme.java
@@ -1,11 +1,11 @@
 
-import special_variable_functions.*;
+import special_variable_macros.*;
 
-public class special_variable_functions_runme {
+public class special_variable_macros_runme {
 
   static {
     try {
-	System.loadLibrary("special_variable_functions");
+	System.loadLibrary("special_variable_macros");
     } catch (UnsatisfiedLinkError e) {
       System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
       System.exit(1);
@@ -14,13 +14,13 @@ public class special_variable_functions_runme {
 
   public static void main(String argv[]) {
     Name name = new Name();
-    if (!special_variable_functions.testFred(name).equals("none"))
+    if (!special_variable_macros.testFred(name).equals("none"))
       throw new RuntimeException("test failed");
-    if (!special_variable_functions.testJack(name).equals("$specialname"))
+    if (!special_variable_macros.testJack(name).equals("$specialname"))
       throw new RuntimeException("test failed");
-    if (!special_variable_functions.testJill(name).equals("jilly"))
+    if (!special_variable_macros.testJill(name).equals("jilly"))
       throw new RuntimeException("test failed");
-    if (!special_variable_functions.testMary(name).equals("SWIGTYPE_p_NameWrap"))
+    if (!special_variable_macros.testMary(name).equals("SWIGTYPE_p_NameWrap"))
       throw new RuntimeException("test failed");
     NewName newName = NewName.factory("factoryname");
     name = newName.getStoredName();
diff --git a/Examples/test-suite/python/special_variable_functions_runme.py b/Examples/test-suite/python/special_variable_functions_runme.py
deleted file mode 100644
index 9473880b8..000000000
--- a/Examples/test-suite/python/special_variable_functions_runme.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import special_variable_functions
-
-name = special_variable_functions.Name()
-if special_variable_functions.testFred(name) != "none":
-  raise "test failed"
-if special_variable_functions.testJack(name) != "$specialname":
-  raise "test failed"
-if special_variable_functions.testJill(name) != "jilly":
-  raise "test failed"
-if special_variable_functions.testMary(name) != "SWIGTYPE_p_NameWrap":
-  raise "test failed"
-
diff --git a/Examples/test-suite/python/special_variable_macros_runme.py b/Examples/test-suite/python/special_variable_macros_runme.py
new file mode 100644
index 000000000..f1969f704
--- /dev/null
+++ b/Examples/test-suite/python/special_variable_macros_runme.py
@@ -0,0 +1,12 @@
+import special_variable_macros
+
+name = special_variable_macros.Name()
+if special_variable_macros.testFred(name) != "none":
+  raise "test failed"
+if special_variable_macros.testJack(name) != "$specialname":
+  raise "test failed"
+if special_variable_macros.testJill(name) != "jilly":
+  raise "test failed"
+if special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap":
+  raise "test failed"
+
diff --git a/Examples/test-suite/special_variable_functions.i b/Examples/test-suite/special_variable_macros.i
similarity index 98%
rename from Examples/test-suite/special_variable_functions.i
rename to Examples/test-suite/special_variable_macros.i
index b0c39d73c..06f5805dd 100644
--- a/Examples/test-suite/special_variable_functions.i
+++ b/Examples/test-suite/special_variable_macros.i
@@ -1,4 +1,4 @@
-%module special_variable_functions
+%module special_variable_macros
 
 // test $typemap() special variable function
 // these tests are not typical of how $typemap() should be used, but it checks that it is mostly working