diff --git a/Examples/test-suite/octave/cpp11_std_unique_ptr_runme.m b/Examples/test-suite/octave/cpp11_std_unique_ptr_runme.m
index 4b1851901..7d1c0e41a 100644
--- a/Examples/test-suite/octave/cpp11_std_unique_ptr_runme.m
+++ b/Examples/test-suite/octave/cpp11_std_unique_ptr_runme.m
@@ -15,7 +15,7 @@ end
 # Test raw pointer handling involving virtual inheritance
 kini = KlassInheritance("KlassInheritanceInput");
 checkCount(1);
-s = takeKlassUniquePtr(kini);
+s = useKlassRawPtr(kini);
 if (!strcmp(s, "KlassInheritanceInput"))
   error("Incorrect string: %s", s);
 endif
diff --git a/Examples/test-suite/octave/li_std_auto_ptr_runme.m b/Examples/test-suite/octave/li_std_auto_ptr_runme.m
index db2fdaf5a..832d75faf 100644
--- a/Examples/test-suite/octave/li_std_auto_ptr_runme.m
+++ b/Examples/test-suite/octave/li_std_auto_ptr_runme.m
@@ -15,7 +15,7 @@ end
 # Test raw pointer handling involving virtual inheritance
 kini = KlassInheritance("KlassInheritanceInput");
 checkCount(1);
-s = takeKlassAutoPtr(kini);
+s = useKlassRawPtr(kini);
 if (!strcmp(s, "KlassInheritanceInput"))
   error("Incorrect string: %s", s);
 endif
diff --git a/Examples/test-suite/perl5/cpp11_std_unique_ptr_runme.pl b/Examples/test-suite/perl5/cpp11_std_unique_ptr_runme.pl
index 9a55c08ec..3e3e7f4b1 100644
--- a/Examples/test-suite/perl5/cpp11_std_unique_ptr_runme.pl
+++ b/Examples/test-suite/perl5/cpp11_std_unique_ptr_runme.pl
@@ -16,7 +16,7 @@ sub checkCount {
 {
   my $kini = new cpp11_std_unique_ptr::KlassInheritance("KlassInheritanceInput");
   checkCount(1);
-  my $s = cpp11_std_unique_ptr::takeKlassUniquePtr($kini);
+  my $s = cpp11_std_unique_ptr::useKlassRawPtr($kini);
   is($s, "KlassInheritanceInput", "Incorrect string: $s");
   undef $kini;
   checkCount(0);
diff --git a/Examples/test-suite/perl5/li_std_auto_ptr_runme.pl b/Examples/test-suite/perl5/li_std_auto_ptr_runme.pl
index 5d367e683..cc71d9128 100644
--- a/Examples/test-suite/perl5/li_std_auto_ptr_runme.pl
+++ b/Examples/test-suite/perl5/li_std_auto_ptr_runme.pl
@@ -16,7 +16,7 @@ sub checkCount {
 {
   my $kini = new li_std_auto_ptr::KlassInheritance("KlassInheritanceInput");
   checkCount(1);
-  my $s = li_std_auto_ptr::takeKlassAutoPtr($kini);
+  my $s = li_std_auto_ptr::useKlassRawPtr($kini);
   is($s, "KlassInheritanceInput", "Incorrect string: $s");
   undef $kini;
   checkCount(0);
diff --git a/Examples/test-suite/php/cpp11_std_unique_ptr_runme.php b/Examples/test-suite/php/cpp11_std_unique_ptr_runme.php
index 5820592de..b02fdaa33 100644
--- a/Examples/test-suite/php/cpp11_std_unique_ptr_runme.php
+++ b/Examples/test-suite/php/cpp11_std_unique_ptr_runme.php
@@ -10,7 +10,7 @@ function checkCount($expected_count) {
 # Test raw pointer handling involving virtual inheritance
 $kini = new KlassInheritance("KlassInheritanceInput");
 checkCount(1);
-$s = takeKlassUniquePtr($kini);
+$s = useKlassRawPtr($kini);
 check::equal($s, "KlassInheritanceInput", "Incorrect string: $s");
 $kini = NULL;
 checkCount(0);
diff --git a/Examples/test-suite/php/li_std_auto_ptr_runme.php b/Examples/test-suite/php/li_std_auto_ptr_runme.php
index c4992c1fe..cba5f2109 100644
--- a/Examples/test-suite/php/li_std_auto_ptr_runme.php
+++ b/Examples/test-suite/php/li_std_auto_ptr_runme.php
@@ -10,7 +10,7 @@ function checkCount($expected_count) {
 # Test raw pointer handling involving virtual inheritance
 $kini = new KlassInheritance("KlassInheritanceInput");
 checkCount(1);
-$s = takeKlassAutoPtr($kini);
+$s = useKlassRawPtr($kini);
 check::equal($s, "KlassInheritanceInput", "Incorrect string: $s");
 $kini = NULL;
 checkCount(0);
diff --git a/Examples/test-suite/python/cpp11_std_unique_ptr_runme.py b/Examples/test-suite/python/cpp11_std_unique_ptr_runme.py
index 92dbc1c30..e822ddf09 100644
--- a/Examples/test-suite/python/cpp11_std_unique_ptr_runme.py
+++ b/Examples/test-suite/python/cpp11_std_unique_ptr_runme.py
@@ -8,7 +8,7 @@ def checkCount(expected_count):
 # Test raw pointer handling involving virtual inheritance
 kini = KlassInheritance("KlassInheritanceInput")
 checkCount(1)
-s = takeKlassUniquePtr(kini)
+s = useKlassRawPtr(kini)
 if s != "KlassInheritanceInput":
     raise RuntimeError("Incorrect string: " + s)
 del kini
diff --git a/Examples/test-suite/python/li_std_auto_ptr_runme.py b/Examples/test-suite/python/li_std_auto_ptr_runme.py
index 881c59bfe..9c68f3e52 100644
--- a/Examples/test-suite/python/li_std_auto_ptr_runme.py
+++ b/Examples/test-suite/python/li_std_auto_ptr_runme.py
@@ -8,7 +8,7 @@ def checkCount(expected_count):
 # Test raw pointer handling involving virtual inheritance
 kini = KlassInheritance("KlassInheritanceInput")
 checkCount(1)
-s = takeKlassAutoPtr(kini)
+s = useKlassRawPtr(kini)
 if s != "KlassInheritanceInput":
     raise RuntimeError("Incorrect string: " + s)
 del kini
diff --git a/Examples/test-suite/ruby/cpp11_std_unique_ptr_runme.rb b/Examples/test-suite/ruby/cpp11_std_unique_ptr_runme.rb
index af4374b77..c623b45c5 100644
--- a/Examples/test-suite/ruby/cpp11_std_unique_ptr_runme.rb
+++ b/Examples/test-suite/ruby/cpp11_std_unique_ptr_runme.rb
@@ -21,11 +21,12 @@ end
 # Test raw pointer handling involving virtual inheritance
 kini = Cpp11_std_unique_ptr::KlassInheritance.new("KlassInheritanceInput")
 checkCount(1)
-s = Cpp11_std_unique_ptr.takeKlassUniquePtr(kini)
+s = Cpp11_std_unique_ptr.useKlassRawPtr(kini)
 if (s != "KlassInheritanceInput")
     raise RuntimeError, "Incorrect string: " + s
 end
-kini = nil
+# kini = nil
+Cpp11_std_unique_ptr.takeKlassUniquePtr(kini) # Ensure object is deleted (can't rely on GC)
 checkCount(0)
 
 
diff --git a/Examples/test-suite/ruby/li_std_auto_ptr_runme.rb b/Examples/test-suite/ruby/li_std_auto_ptr_runme.rb
index ba74b12a7..6780763c0 100644
--- a/Examples/test-suite/ruby/li_std_auto_ptr_runme.rb
+++ b/Examples/test-suite/ruby/li_std_auto_ptr_runme.rb
@@ -21,11 +21,12 @@ end
 # Test raw pointer handling involving virtual inheritance
 kini = Li_std_auto_ptr::KlassInheritance.new("KlassInheritanceInput")
 checkCount(1)
-s = Li_std_auto_ptr.takeKlassAutoPtr(kini)
+s = Li_std_auto_ptr.useKlassRawPtr(kini)
 if (s != "KlassInheritanceInput")
     raise RuntimeError, "Incorrect string: " + s
 end
-kini = nil
+# kini = nil
+Li_std_auto_ptr.takeKlassAutoPtr(kini) # Ensure object is deleted (can't rely on GC)
 checkCount(0)
 
 
diff --git a/Examples/test-suite/tcl/cpp11_std_unique_ptr_runme.tcl b/Examples/test-suite/tcl/cpp11_std_unique_ptr_runme.tcl
index 2b71799e7..380985f4e 100644
--- a/Examples/test-suite/tcl/cpp11_std_unique_ptr_runme.tcl
+++ b/Examples/test-suite/tcl/cpp11_std_unique_ptr_runme.tcl
@@ -47,7 +47,7 @@ checkCount 0
 # Test raw pointer handling involving virtual inheritance
 KlassInheritance kini "KlassInheritanceInput"
 checkCount 1
-set s [takeKlassUniquePtr kini]
+set s [useKlassRawPtr kini]
 kini -delete
 checkCount 0
 
diff --git a/Examples/test-suite/tcl/li_std_auto_ptr_runme.tcl b/Examples/test-suite/tcl/li_std_auto_ptr_runme.tcl
index e9a41aabd..f88be1aed 100644
--- a/Examples/test-suite/tcl/li_std_auto_ptr_runme.tcl
+++ b/Examples/test-suite/tcl/li_std_auto_ptr_runme.tcl
@@ -18,7 +18,7 @@ proc checkCount {expected_count} {
 # Test raw pointer handling involving virtual inheritance
 KlassInheritance kini "KlassInheritanceInput"
 checkCount 1
-set s [takeKlassAutoPtr kini]
+set s [useKlassRawPtr kini]
 kini -delete
 checkCount 0