diff --git a/SWIG/Examples/test-suite/python/li_std_map_runme.py b/SWIG/Examples/test-suite/python/li_std_map_runme.py
index 00fe41a89..be190f101 100644
--- a/SWIG/Examples/test-suite/python/li_std_map_runme.py
+++ b/SWIG/Examples/test-suite/python/li_std_map_runme.py
@@ -1,17 +1,17 @@
-import lib_std_map
+import li_std_map
 
-a1 = lib_std_map.A(3)
-a2 = lib_std_map.A(7)
+a1 = li_std_map.A(3)
+a2 = li_std_map.A(7)
 
 
 if 1:
-  p0 = lib_std_map.pairii(1,2)
-  p1 = lib_std_map.pairA(1,a1.this)
+  p0 = li_std_map.pairii(1,2)
+  p1 = li_std_map.pairA(1,a1.this)
   m = {}
   m[1] = a1
   m[2] = a2
   
-  lib_std_map.p_identa(p1)
-  lib_std_map.m_identa(m)
+  li_std_map.p_identa(p1)
+  li_std_map.m_identa(m)
   
 
diff --git a/SWIG/Examples/test-suite/python/li_std_pair_runme.py b/SWIG/Examples/test-suite/python/li_std_pair_runme.py
index 398e2b1d4..27e291d08 100644
--- a/SWIG/Examples/test-suite/python/li_std_pair_runme.py
+++ b/SWIG/Examples/test-suite/python/li_std_pair_runme.py
@@ -1,33 +1,33 @@
-import lib_std_pair
+import li_std_pair
 
 p = (1,2)
-p1 = lib_std_pair.p_inout(p)
-p2 = lib_std_pair.p_inoutd(p1)
+p1 = li_std_pair.p_inout(p)
+p2 = li_std_pair.p_inoutd(p1)
 
-d1 = lib_std_pair.d_inout(2)
+d1 = li_std_pair.d_inout(2)
 
-i,d2 = lib_std_pair.d_inout2(2)
+i,d2 = li_std_pair.d_inout2(2)
 
-i,p = lib_std_pair.p_inout2(p)
-p3,p4 = lib_std_pair.p_inout3(p1,p1)
+i,p = li_std_pair.p_inout2(p)
+p3,p4 = li_std_pair.p_inout3(p1,p1)
 
-psi = lib_std_pair.SIPair("hello",1)
-pci = lib_std_pair.CIPair(1,1)
+psi = li_std_pair.SIPair("hello",1)
+pci = li_std_pair.CIPair(1,1)
 
 
 #psi.first = "hi"
 
 
-psi = lib_std_pair.SIPair("hi",1)
+psi = li_std_pair.SIPair("hi",1)
 if psi != ("hi",1):
   raise RuntimeError
 
-psii = lib_std_pair.SIIPair(psi,1)
+psii = li_std_pair.SIIPair(psi,1)
 
-a = lib_std_pair.A()
-b = lib_std_pair.B()
+a = li_std_pair.A()
+b = li_std_pair.B()
 
-pab = lib_std_pair.ABPair(a,b);
+pab = li_std_pair.ABPair(a,b);
 
 pab.first = a
 pab.first.val = 2
@@ -36,14 +36,14 @@ if pab.first.val != 2:
   raise RuntimeError
   
 
-pci = lib_std_pair.CIntPair(1,0)
+pci = li_std_pair.CIntPair(1,0)
 
-a = lib_std_pair.A(5)
-p1 = lib_std_pair.pairP1(1,a.this)
-p2 = lib_std_pair.pairP2(a,1)
-p3 = lib_std_pair.pairP3(a,a)
+a = li_std_pair.A(5)
+p1 = li_std_pair.pairP1(1,a.this)
+p2 = li_std_pair.pairP2(a,1)
+p3 = li_std_pair.pairP3(a,a)
 
 
-if a.val != lib_std_pair.p_identa(p1.this)[1].val:
+if a.val != li_std_pair.p_identa(p1.this)[1].val:
   raise RuntimeError
   
diff --git a/SWIG/Examples/test-suite/python/li_std_string_runme.py b/SWIG/Examples/test-suite/python/li_std_string_runme.py
index 51f7b46d1..1564da560 100644
--- a/SWIG/Examples/test-suite/python/li_std_string_runme.py
+++ b/SWIG/Examples/test-suite/python/li_std_string_runme.py
@@ -1,23 +1,23 @@
-import lib_std_string
+import li_std_string
 
 x="hello"
 
 
 
-if lib_std_string.test_ccvalue(x) != x:
+if li_std_string.test_ccvalue(x) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_cvalue(x) != x:
+if li_std_string.test_cvalue(x) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_value(x) != x:
+if li_std_string.test_value(x) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_const_reference(x) != x:
+if li_std_string.test_const_reference(x) != x:
   raise RuntimeError, "bad string mapping"
 
 
-s = lib_std_string.string("he")
+s = li_std_string.string("he")
 #s += "ll"
 #s.append('o')
 s += "llo"
@@ -29,21 +29,21 @@ if s != x:
 if s[1:4] != x[1:4]:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_value(s) != x:
+if li_std_string.test_value(s) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_const_reference(s) != x:
+if li_std_string.test_const_reference(s) != x:
   raise RuntimeError, "bad string mapping"
 
-a = lib_std_string.A(s)
+a = li_std_string.A(s)
 
-if lib_std_string.test_value(a) != x:
+if li_std_string.test_value(a) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_string.test_const_reference(a) != x:
+if li_std_string.test_const_reference(a) != x:
   raise RuntimeError, "bad string mapping"
 
-b = lib_std_string.string(" world")
+b = li_std_string.string(" world")
 
 if a + b != "hello world":
   raise RuntimeError, "bad string mapping"
@@ -60,14 +60,14 @@ if c.find_last_of("l") != 9:
   
 s = "hello world"
 
-b = lib_std_string.B("hi")
+b = li_std_string.B("hi")
 
-b.name = lib_std_string.string("hello")
+b.name = li_std_string.string("hello")
 if b.name != "hello":
   raise RuntimeError, "bad string mapping"
 
 
-b.a = lib_std_string.A("hello")
+b.a = li_std_string.A("hello")
 if b.a != "hello":
   raise RuntimeError, "bad string mapping"
 
diff --git a/SWIG/Examples/test-suite/python/li_std_vector_runme.py b/SWIG/Examples/test-suite/python/li_std_vector_runme.py
index bf3e4891b..89e5f3968 100644
--- a/SWIG/Examples/test-suite/python/li_std_vector_runme.py
+++ b/SWIG/Examples/test-suite/python/li_std_vector_runme.py
@@ -1,4 +1,4 @@
-from lib_std_vector import *
+from li_std_vector import *
 
 iv = IntVector(4)
 for i in range(0,4):
diff --git a/SWIG/Examples/test-suite/python/li_std_wstring_runme.py b/SWIG/Examples/test-suite/python/li_std_wstring_runme.py
index 6d088373a..3e49033fd 100644
--- a/SWIG/Examples/test-suite/python/li_std_wstring_runme.py
+++ b/SWIG/Examples/test-suite/python/li_std_wstring_runme.py
@@ -1,26 +1,26 @@
-import lib_std_wstring
+import li_std_wstring
 
 x=u"h"
 
-if lib_std_wstring.test_wcvalue(x) != x:
+if li_std_wstring.test_wcvalue(x) != x:
   raise RuntimeError, "bad string mapping"
 
 x=u"hello"
-if lib_std_wstring.test_ccvalue(x) != x:
+if li_std_wstring.test_ccvalue(x) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_cvalue(x) != x:
+if li_std_wstring.test_cvalue(x) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_value(x) != x:
-  print x, lib_std_wstring.test_value(x)
+if li_std_wstring.test_value(x) != x:
+  print x, li_std_wstring.test_value(x)
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_const_reference(x) != x:
+if li_std_wstring.test_const_reference(x) != x:
   raise RuntimeError, "bad string mapping"
 
 
-s = lib_std_wstring.wstring(u"he")
+s = li_std_wstring.wstring(u"he")
 s += u"llo"
 
 if s != x:
@@ -30,21 +30,21 @@ if s != x:
 if s[1:4] != x[1:4]:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_value(s) != x:
+if li_std_wstring.test_value(s) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_const_reference(s) != x:
+if li_std_wstring.test_const_reference(s) != x:
   raise RuntimeError, "bad string mapping"
 
-a = lib_std_wstring.A(s)
+a = li_std_wstring.A(s)
 
-if lib_std_wstring.test_value(a) != x:
+if li_std_wstring.test_value(a) != x:
   raise RuntimeError, "bad string mapping"
 
-if lib_std_wstring.test_const_reference(a) != x:
+if li_std_wstring.test_const_reference(a) != x:
   raise RuntimeError, "bad string mapping"
 
-b = lib_std_wstring.wstring(" world")
+b = li_std_wstring.wstring(" world")
 
 if a + b != "hello world":
   raise RuntimeError, "bad string mapping"
@@ -61,14 +61,14 @@ if c.find_last_of("l") != 9:
   
 s = "hello world"
 
-b = lib_std_wstring.B("hi")
+b = li_std_wstring.B("hi")
 
-b.name = lib_std_wstring.wstring(u"hello")
+b.name = li_std_wstring.wstring(u"hello")
 if b.name != "hello":
   raise RuntimeError, "bad string mapping"
 
 
-b.a = lib_std_wstring.A("hello")
+b.a = li_std_wstring.A("hello")
 if b.a != u"hello":
   raise RuntimeError, "bad string mapping"