diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index e7e3dd07b..944f682b0 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -575,7 +575,7 @@ CPP11_TEST_CASES += \
 	cpp11_initializer_list \
 	cpp11_initializer_list_extend \
 	cpp11_lambda_functions \
-	cpp11_li_std_array \
+	cpp11_std_array \
 	cpp11_noexcept \
 	cpp11_null_pointer_constant \
 	cpp11_raw_string_literals \
diff --git a/Examples/test-suite/cpp11_li_std_array.i b/Examples/test-suite/cpp11_std_array.i
similarity index 97%
rename from Examples/test-suite/cpp11_li_std_array.i
rename to Examples/test-suite/cpp11_std_array.i
index dedd6483a..3d4771551 100644
--- a/Examples/test-suite/cpp11_li_std_array.i
+++ b/Examples/test-suite/cpp11_std_array.i
@@ -1,4 +1,4 @@
-%module cpp11_li_std_array
+%module cpp11_std_array
 
 #if defined(SWIGPYTHON) || defined(SWIGRUBY) || defined(SWIGJAVA) || defined(SWIGCSHARP)
 
diff --git a/Examples/test-suite/csharp/cpp11_li_std_array_runme.cs b/Examples/test-suite/csharp/cpp11_std_array_runme.cs
similarity index 75%
rename from Examples/test-suite/csharp/cpp11_li_std_array_runme.cs
rename to Examples/test-suite/csharp/cpp11_std_array_runme.cs
index d0c956ad3..ee7c5ee24 100644
--- a/Examples/test-suite/csharp/cpp11_li_std_array_runme.cs
+++ b/Examples/test-suite/csharp/cpp11_std_array_runme.cs
@@ -1,8 +1,8 @@
 // This test tests all the methods in the C# collection wrapper
 using System;
-using cpp11_li_std_arrayNamespace;
+using cpp11_std_arrayNamespace;
 
-public class cpp11_li_std_array_runme
+public class cpp11_std_array_runme
 {
     private static ArrayInt6 ToArray6(int[] a)
     {
@@ -37,24 +37,24 @@ public class cpp11_li_std_array_runme
         compareContainers(ai, vals);
 
         // Check return
-        compareContainers(cpp11_li_std_array.arrayOutVal(), new int[] { -2, -1, 0, 0, 1, 2 });
-        compareContainers(cpp11_li_std_array.arrayOutConstRef(), new int[] { -2, -1, 0, 0, 1, 2 });
-        compareContainers(cpp11_li_std_array.arrayOutRef(), new int[] { -2, -1, 0, 0, 1, 2 });
-        compareContainers(cpp11_li_std_array.arrayOutPtr(), new int[] { -2, -1, 0, 0, 1, 2 });
+        compareContainers(cpp11_std_array.arrayOutVal(), new int[] { -2, -1, 0, 0, 1, 2 });
+        compareContainers(cpp11_std_array.arrayOutConstRef(), new int[] { -2, -1, 0, 0, 1, 2 });
+        compareContainers(cpp11_std_array.arrayOutRef(), new int[] { -2, -1, 0, 0, 1, 2 });
+        compareContainers(cpp11_std_array.arrayOutPtr(), new int[] { -2, -1, 0, 0, 1, 2 });
 
         // Check passing arguments
-        ai = cpp11_li_std_array.arrayInVal(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
+        ai = cpp11_std_array.arrayInVal(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
         compareContainers(ai, new int[] { 90, 80, 70, 60, 50, 40 });
 
-        ai = cpp11_li_std_array.arrayInConstRef(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
+        ai = cpp11_std_array.arrayInConstRef(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
         compareContainers(ai, new int[] { 90, 80, 70, 60, 50, 40 });
 
         ai = new ArrayInt6(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
-        cpp11_li_std_array.arrayInRef(ai);
+        cpp11_std_array.arrayInRef(ai);
         compareContainers(ai, new int[] { 90, 80, 70, 60, 50, 40 });
 
         ai = new ArrayInt6(ToArray6(new int[] { 9, 8, 7, 6, 5, 4 }));
-        cpp11_li_std_array.arrayInPtr(ai);
+        cpp11_std_array.arrayInPtr(ai);
         compareContainers(ai, new int[] { 90, 80, 70, 60, 50, 40 });
 
         // fill
diff --git a/Examples/test-suite/java/cpp11_li_std_array_runme.java b/Examples/test-suite/java/cpp11_std_array_runme.java
similarity index 75%
rename from Examples/test-suite/java/cpp11_li_std_array_runme.java
rename to Examples/test-suite/java/cpp11_std_array_runme.java
index 2e2a20138..58fdc176b 100644
--- a/Examples/test-suite/java/cpp11_li_std_array_runme.java
+++ b/Examples/test-suite/java/cpp11_std_array_runme.java
@@ -1,10 +1,10 @@
-import cpp11_li_std_array.*;
+import cpp11_std_array.*;
 
-public class cpp11_li_std_array_runme {
+public class cpp11_std_array_runme {
 
   static {
     try {
-        System.loadLibrary("cpp11_li_std_array");
+        System.loadLibrary("cpp11_std_array");
     } 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);
@@ -43,24 +43,24 @@ public class cpp11_li_std_array_runme {
     compareContainers(ai, vals);
 
     // Check return
-    compareContainers(cpp11_li_std_array.arrayOutVal(), new int[] {-2, -1, 0, 0, 1, 2});
-    compareContainers(cpp11_li_std_array.arrayOutConstRef(), new int[] {-2, -1, 0, 0, 1, 2});
-    compareContainers(cpp11_li_std_array.arrayOutRef(), new int[] {-2, -1, 0, 0, 1, 2});
-    compareContainers(cpp11_li_std_array.arrayOutPtr(), new int[] {-2, -1, 0, 0, 1, 2});
+    compareContainers(cpp11_std_array.arrayOutVal(), new int[] {-2, -1, 0, 0, 1, 2});
+    compareContainers(cpp11_std_array.arrayOutConstRef(), new int[] {-2, -1, 0, 0, 1, 2});
+    compareContainers(cpp11_std_array.arrayOutRef(), new int[] {-2, -1, 0, 0, 1, 2});
+    compareContainers(cpp11_std_array.arrayOutPtr(), new int[] {-2, -1, 0, 0, 1, 2});
 
     // Check passing arguments
-    ai = cpp11_li_std_array.arrayInVal(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
+    ai = cpp11_std_array.arrayInVal(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
     compareContainers(ai, new int[] {90, 80, 70, 60, 50, 40});
 
-    ai = cpp11_li_std_array.arrayInConstRef(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
+    ai = cpp11_std_array.arrayInConstRef(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
     compareContainers(ai, new int[] {90, 80, 70, 60, 50, 40});
 
     ai = new ArrayInt6(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
-    cpp11_li_std_array.arrayInRef(ai);
+    cpp11_std_array.arrayInRef(ai);
     compareContainers(ai, new int[] {90, 80, 70, 60, 50, 40});
 
     ai = new ArrayInt6(ToArray6(new int[] {9, 8, 7, 6, 5, 4}));
-    cpp11_li_std_array.arrayInPtr(ai);
+    cpp11_std_array.arrayInPtr(ai);
     compareContainers(ai, new int[] {90, 80, 70, 60, 50, 40});
 
     // fill
diff --git a/Examples/test-suite/python/cpp11_li_std_array_runme.py b/Examples/test-suite/python/cpp11_std_array_runme.py
similarity index 99%
rename from Examples/test-suite/python/cpp11_li_std_array_runme.py
rename to Examples/test-suite/python/cpp11_std_array_runme.py
index 3b1ceb2f8..e5e7373dd 100644
--- a/Examples/test-suite/python/cpp11_li_std_array_runme.py
+++ b/Examples/test-suite/python/cpp11_std_array_runme.py
@@ -1,4 +1,4 @@
-from cpp11_li_std_array import *
+from cpp11_std_array import *
 import sys
 
 
diff --git a/Examples/test-suite/ruby/cpp11_li_std_array_runme.rb b/Examples/test-suite/ruby/cpp11_std_array_runme.rb
similarity index 98%
rename from Examples/test-suite/ruby/cpp11_li_std_array_runme.rb
rename to Examples/test-suite/ruby/cpp11_std_array_runme.rb
index 770f37c0f..13c5efb84 100644
--- a/Examples/test-suite/ruby/cpp11_li_std_array_runme.rb
+++ b/Examples/test-suite/ruby/cpp11_std_array_runme.rb
@@ -9,9 +9,9 @@
 
 require 'swig_assert'
 
-require 'cpp11_li_std_array'
+require 'cpp11_std_array'
 
-include Cpp11_li_std_array
+include Cpp11_std_array
 
 
 def failed(a, b, msg)