diff --git a/Examples/test-suite/cpp11_li_std_unordered_map.i b/Examples/test-suite/cpp11_li_std_unordered_map.i
deleted file mode 100644
index 5f40e76fd..000000000
--- a/Examples/test-suite/cpp11_li_std_unordered_map.i
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * A test of unordered_map containers.
- */
-
-%module cpp11_li_std_unordered_map
-
-%include <std_string.i>
-%include <std_unordered_map.i>
-
-%template(IntIntUnorderedMap) std::unordered_map<int, int>;
-%template(StringIntUnorderedMap) std::unordered_map<std::string, int>;
diff --git a/Examples/test-suite/cpp11_li_std_unordered_set.i b/Examples/test-suite/cpp11_li_std_unordered_set.i
deleted file mode 100644
index e9711ce60..000000000
--- a/Examples/test-suite/cpp11_li_std_unordered_set.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * A test of unordered_set containers.
- */
-
-%module cpp11_li_std_unordered_set
-
-%include <std_string.i>
-%include <std_unordered_set.i>
-
-%template(StringUnorderedSet) std::unordered_set<std::string>;
diff --git a/Examples/test-suite/cpp11_std_unordered_map.i b/Examples/test-suite/cpp11_std_unordered_map.i
index 56c4a5248..b11d8f275 100644
--- a/Examples/test-suite/cpp11_std_unordered_map.i
+++ b/Examples/test-suite/cpp11_std_unordered_map.i
@@ -1,5 +1,7 @@
 %module cpp11_std_unordered_map
 
+%include <std_string.i>
 %include <std_unordered_map.i>
 
 %template(UnorderedMapIntInt) std::unordered_map<int, int>;
+%template(UnorderedMapStringInt) std::unordered_map<std::string, int>;
diff --git a/Examples/test-suite/cpp11_std_unordered_set.i b/Examples/test-suite/cpp11_std_unordered_set.i
index f5652cb88..c2b8174bb 100644
--- a/Examples/test-suite/cpp11_std_unordered_set.i
+++ b/Examples/test-suite/cpp11_std_unordered_set.i
@@ -1,5 +1,7 @@
 %module cpp11_std_unordered_set
 
+%include <std_string.i>
 %include <std_unordered_set.i>
 
 %template(UnorderedSetInt) std::unordered_set<int>;
+%template(UnorderedSetString) std::unordered_set<std::string>;
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index 3323f8a9c..2e788fa07 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -53,9 +53,9 @@ CPP11_TEST_CASES = \
 	cpp11_shared_ptr_nullptr_in_containers \
 	cpp11_shared_ptr_overload \
 	cpp11_shared_ptr_upcast \
+	cpp11_std_unordered_map \
+	cpp11_std_unordered_set \
 	cpp11_strongly_typed_enumerations_simple \
-	cpp11_li_std_unordered_map \
-	cpp11_li_std_unordered_set \
 
 DOXYGEN_TEST_CASES := \
 	doxygen_parsing_enums_simple \
diff --git a/Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java b/Examples/test-suite/java/cpp11_std_unordered_map_runme.java
similarity index 92%
rename from Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java
rename to Examples/test-suite/java/cpp11_std_unordered_map_runme.java
index bb85eeadd..79f683378 100644
--- a/Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java
+++ b/Examples/test-suite/java/cpp11_std_unordered_map_runme.java
@@ -1,10 +1,10 @@
-import cpp11_li_std_unordered_map.*;
+import cpp11_std_unordered_map.*;
 
-public class cpp11_li_std_unordered_map_runme {
+public class cpp11_std_unordered_map_runme {
 
   static {
     try {
-      System.loadLibrary("cpp11_li_std_unordered_map");
+      System.loadLibrary("cpp11_std_unordered_map");
     } 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);
@@ -20,8 +20,8 @@ public class cpp11_li_std_unordered_map_runme {
 
   public static void main(String argv[]) throws Throwable
   {
-    java.util.AbstractMap<String, Integer> sim = new StringIntUnorderedMap();
-    java.util.AbstractMap<Integer, Integer> iim = new IntIntUnorderedMap();
+    java.util.AbstractMap<String, Integer> sim = new UnorderedMapStringInt();
+    java.util.AbstractMap<Integer, Integer> iim = new UnorderedMapIntInt();
 
     checkThat(sim.isEmpty());
     checkThat(iim.isEmpty());
diff --git a/Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java b/Examples/test-suite/java/cpp11_std_unordered_set_runme.java
similarity index 89%
rename from Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java
rename to Examples/test-suite/java/cpp11_std_unordered_set_runme.java
index dddf00307..9d64ab240 100644
--- a/Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java
+++ b/Examples/test-suite/java/cpp11_std_unordered_set_runme.java
@@ -1,10 +1,10 @@
-import cpp11_li_std_unordered_set.*;
+import cpp11_std_unordered_set.*;
 
-public class cpp11_li_std_unordered_set_runme {
+public class cpp11_std_unordered_set_runme {
 
   static {
     try {
-      System.loadLibrary("cpp11_li_std_unordered_set");
+      System.loadLibrary("cpp11_std_unordered_set");
     } 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);
@@ -20,7 +20,7 @@ public class cpp11_li_std_unordered_set_runme {
 
   public static void main(String argv[]) throws Throwable
   {
-    java.util.AbstractSet<String> ss = new StringUnorderedSet();
+    java.util.AbstractSet<String> ss = new UnorderedSetString();
 
     checkThat(ss.isEmpty());
     checkThat(!ss.contains("key"));
@@ -63,7 +63,7 @@ public class cpp11_li_std_unordered_set_runme {
     checkThat(ss.containsAll(found));
     checkThat(found.containsAll(ss));
 
-    java.util.AbstractSet<String> ss2 = new StringUnorderedSet(ss);
+    java.util.AbstractSet<String> ss2 = new UnorderedSetString(ss);
     checkThat(ss2.containsAll(ss));
     checkThat(ss.containsAll(ss2));