diff --git a/SWIG/Examples/Makefile.in b/SWIG/Examples/Makefile.in
index d13fa08a4..cbf58102e 100644
--- a/SWIG/Examples/Makefile.in
+++ b/SWIG/Examples/Makefile.in
@@ -747,7 +747,7 @@ CHICKEN_MAIN =
 
 # SWIG produces $(ISRCS) (the C wrapper file) 
 # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file):
-CHICKEN_GENERATED_SCHEME = `echo $(INTERFACE:.i=.scm) | sed 's/_/-/g'`
+CHICKEN_GENERATED_SCHEME = $(INTERFACE:.i=.scm)
 CHICKEN_COMPILED_SCHEME = $(INTERFACE:.i=_chicken.c)
 CHICKEN_COMPILED_OBJECT = $(CHICKEN_COMPILED_SCHEME:.c=.@OBJEXT@)
 
diff --git a/SWIG/Examples/test-suite/chicken/casts_runme.ss b/SWIG/Examples/test-suite/chicken/casts_runme.ss
index 8f201717f..129f42efb 100644
--- a/SWIG/Examples/test-suite/chicken/casts_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/casts_runme.ss
@@ -1 +1,2 @@
+(load-library 'casts "casts.so")
 (include "../schemerunme/casts.scm")
diff --git a/SWIG/Examples/test-suite/chicken/char_constant_runme.ss b/SWIG/Examples/test-suite/chicken/char_constant_runme.ss
index 58a487fe5..4b5db6a8d 100644
--- a/SWIG/Examples/test-suite/chicken/char_constant_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/char_constant_runme.ss
@@ -1 +1,2 @@
+(load-library 'char_constant "char_constant.so")
 (include "../schemerunme/char_constant.scm")
diff --git a/SWIG/Examples/test-suite/chicken/class_ignore_runme.ss b/SWIG/Examples/test-suite/chicken/class_ignore_runme.ss
index fdcf8349b..f9d52c9fc 100644
--- a/SWIG/Examples/test-suite/chicken/class_ignore_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/class_ignore_runme.ss
@@ -1 +1,2 @@
+(load-library 'class_ignore "class_ignore.so")
 (include "../schemerunme/class_ignore.scm")
diff --git a/SWIG/Examples/test-suite/chicken/constover_runme.ss b/SWIG/Examples/test-suite/chicken/constover_runme.ss
index 3cec3e068..5d5e650c5 100644
--- a/SWIG/Examples/test-suite/chicken/constover_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/constover_runme.ss
@@ -1 +1,2 @@
+(load-library 'constover "constover.so")
 (include "../schemerunme/constover.scm")
diff --git a/SWIG/Examples/test-suite/chicken/contract_runme.ss b/SWIG/Examples/test-suite/chicken/contract_runme.ss
index 23ebeb2eb..511b9d851 100644
--- a/SWIG/Examples/test-suite/chicken/contract_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/contract_runme.ss
@@ -1 +1,2 @@
+(load-library 'contract "contract.so")
 (include "../schemerunme/contract.scm")
diff --git a/SWIG/Examples/test-suite/chicken/cpp_namespace_runme.ss b/SWIG/Examples/test-suite/chicken/cpp_namespace_runme.ss
index 41abd9f7e..f677553ad 100644
--- a/SWIG/Examples/test-suite/chicken/cpp_namespace_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/cpp_namespace_runme.ss
@@ -1 +1,2 @@
+(load-library 'cpp_namespace "cpp_namespace.so")
 (include "../schemerunme/cpp_namespace.scm")
diff --git a/SWIG/Examples/test-suite/chicken/dynamic_cast_runme.ss b/SWIG/Examples/test-suite/chicken/dynamic_cast_runme.ss
index 7093d872f..6c86f57c1 100644
--- a/SWIG/Examples/test-suite/chicken/dynamic_cast_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/dynamic_cast_runme.ss
@@ -1 +1,2 @@
+(load-library 'dynamic_cast "dynamic_cast.so")
 (include "../schemerunme/dynamic_cast.scm")
diff --git a/SWIG/Examples/test-suite/chicken/import_nomodule_runme.ss b/SWIG/Examples/test-suite/chicken/import_nomodule_runme.ss
index 436836223..e2e2c4a26 100644
--- a/SWIG/Examples/test-suite/chicken/import_nomodule_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/import_nomodule_runme.ss
@@ -1 +1,2 @@
+(load-library 'import_nomodule "import_nomodule.so")
 (include "../schemerunme/import_nomodule.scm")
diff --git a/SWIG/Examples/test-suite/chicken/imports_runme.ss b/SWIG/Examples/test-suite/chicken/imports_runme.ss
index 8992cf283..a11190844 100644
--- a/SWIG/Examples/test-suite/chicken/imports_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/imports_runme.ss
@@ -1 +1,3 @@
+(load-library 'imports_a "imports_a.so")
+(load-library 'imports_b "imports_b.so")
 (include "../schemerunme/imports.scm")
diff --git a/SWIG/Examples/test-suite/chicken/inherit_missing_runme.ss b/SWIG/Examples/test-suite/chicken/inherit_missing_runme.ss
index 9ccbf077a..7de928496 100644
--- a/SWIG/Examples/test-suite/chicken/inherit_missing_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/inherit_missing_runme.ss
@@ -1 +1,2 @@
+(load-library 'inherit_missing "inherit_missing.so")
 (include "../schemerunme/inherit_missing.scm")
diff --git a/SWIG/Examples/test-suite/chicken/list_vector_runme.ss b/SWIG/Examples/test-suite/chicken/list_vector_runme.ss
index 7307b9139..c977eac6b 100644
--- a/SWIG/Examples/test-suite/chicken/list_vector_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/list_vector_runme.ss
@@ -1 +1,2 @@
+(load-library 'list_vector "list_vector.so")
 (include "../schemerunme/list_vector.scm")
diff --git a/SWIG/Examples/test-suite/chicken/multivalue_runme.ss b/SWIG/Examples/test-suite/chicken/multivalue_runme.ss
index 070d866b9..135e6a8ab 100644
--- a/SWIG/Examples/test-suite/chicken/multivalue_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/multivalue_runme.ss
@@ -1,3 +1,4 @@
 ;; this doesn't work yet :(
-;;(include "../schemerunme/multivalue.scm")
+(load-library 'multivalue "multivalue.so")
+(include "../schemerunme/multivalue.scm")
 (exit 0)
diff --git a/SWIG/Examples/test-suite/chicken/name_runme.ss b/SWIG/Examples/test-suite/chicken/name_runme.ss
index 07100a37b..47a6c5933 100644
--- a/SWIG/Examples/test-suite/chicken/name_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/name_runme.ss
@@ -1 +1,2 @@
+(load-library 'name "name.so")
 (include "../schemerunme/name.scm")
diff --git a/SWIG/Examples/test-suite/chicken/overload_complicated_runme.ss b/SWIG/Examples/test-suite/chicken/overload_complicated_runme.ss
index 4e5f5481b..e42090986 100644
--- a/SWIG/Examples/test-suite/chicken/overload_complicated_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/overload_complicated_runme.ss
@@ -1 +1,2 @@
+(load-library 'overload_complicated "overload_complicated.so")
 (include "../schemerunme/overload_complicated.scm")
diff --git a/SWIG/Examples/test-suite/chicken/overload_copy_runme.ss b/SWIG/Examples/test-suite/chicken/overload_copy_runme.ss
index 07546b94d..1ba8f7ea6 100644
--- a/SWIG/Examples/test-suite/chicken/overload_copy_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/overload_copy_runme.ss
@@ -1 +1,2 @@
+(load-library 'overload_copy "overload_copy.so")
 (include "../schemerunme/overload_copy.scm")
diff --git a/SWIG/Examples/test-suite/chicken/overload_extend_runme.ss b/SWIG/Examples/test-suite/chicken/overload_extend_runme.ss
index be3679cf4..57917c16a 100644
--- a/SWIG/Examples/test-suite/chicken/overload_extend_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/overload_extend_runme.ss
@@ -1 +1,2 @@
+(load-library 'overload_extend "overload_extend.so")
 (include "../schemerunme/overload_extend.scm")
diff --git a/SWIG/Examples/test-suite/chicken/overload_simple_runme.ss b/SWIG/Examples/test-suite/chicken/overload_simple_runme.ss
index 1228801ea..61fbd35ea 100644
--- a/SWIG/Examples/test-suite/chicken/overload_simple_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/overload_simple_runme.ss
@@ -1 +1,2 @@
+(load-library 'overload_simple "overload_simple.so")
 (include "../schemerunme/overload_simple.scm")
diff --git a/SWIG/Examples/test-suite/chicken/overload_subtype_runme.ss b/SWIG/Examples/test-suite/chicken/overload_subtype_runme.ss
index ffcfca253..6ce2e0410 100644
--- a/SWIG/Examples/test-suite/chicken/overload_subtype_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/overload_subtype_runme.ss
@@ -1 +1,2 @@
+(load-library 'overload_subtype "overload_subtype.so")
 (include "../schemerunme/overload_subtype.scm")
diff --git a/SWIG/Examples/test-suite/chicken/pointer_in_out_runme.ss b/SWIG/Examples/test-suite/chicken/pointer_in_out_runme.ss
index 5b53fecdc..7ed2ce9c2 100644
--- a/SWIG/Examples/test-suite/chicken/pointer_in_out_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/pointer_in_out_runme.ss
@@ -1 +1,2 @@
+(load-library 'pointer_in_out "pointer_in_out.so")
 (include "../schemerunme/pointer_in_out.scm")
diff --git a/SWIG/Examples/test-suite/chicken/reference_global_vars_runme.ss b/SWIG/Examples/test-suite/chicken/reference_global_vars_runme.ss
index 20848c321..462e3007f 100644
--- a/SWIG/Examples/test-suite/chicken/reference_global_vars_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/reference_global_vars_runme.ss
@@ -1 +1,2 @@
+(load-library 'reference_global_vars "reference_global_vars.so")
 (include "../schemerunme/reference_global_vars.scm")
diff --git a/SWIG/Examples/test-suite/chicken/typedef_inherit_runme.ss b/SWIG/Examples/test-suite/chicken/typedef_inherit_runme.ss
index 76772ecd6..6686c3e5a 100644
--- a/SWIG/Examples/test-suite/chicken/typedef_inherit_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/typedef_inherit_runme.ss
@@ -1 +1,2 @@
+(load-library 'typedef_inherit "typedef_inherit.so")
 (include "../schemerunme/typedef_inherit.scm")
diff --git a/SWIG/Examples/test-suite/chicken/typename_runme.ss b/SWIG/Examples/test-suite/chicken/typename_runme.ss
index f94ad8a79..e9350017c 100644
--- a/SWIG/Examples/test-suite/chicken/typename_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/typename_runme.ss
@@ -1 +1,2 @@
+(load-library 'typename "typename.so")
 (include "../schemerunme/typename.scm")
diff --git a/SWIG/Examples/test-suite/chicken/unions_runme.ss b/SWIG/Examples/test-suite/chicken/unions_runme.ss
index 1a9855f22..31dc9ae6a 100644
--- a/SWIG/Examples/test-suite/chicken/unions_runme.ss
+++ b/SWIG/Examples/test-suite/chicken/unions_runme.ss
@@ -1 +1,2 @@
+(load-library 'unions "unions.so")
 (include "../schemerunme/unions.scm")
diff --git a/SWIG/Source/Modules/chicken.cxx b/SWIG/Source/Modules/chicken.cxx
index a60dbac30..82c893a19 100644
--- a/SWIG/Source/Modules/chicken.cxx
+++ b/SWIG/Source/Modules/chicken.cxx
@@ -1058,7 +1058,7 @@ CHICKEN::membervariableHandler(Node *n)
 
   if (!Getattr(n,"feature:immutable")) {
       if (closclassname) {
-          Printv(closcode, " ':swig-set (lambda (x y) (", chickenPrimitiveName(setfunc), " x (slot-ref y 'swig-this))\n");
+          Printv(closcode, " ':swig-set (lambda (x y) (", chickenPrimitiveName(setfunc), " x (slot-ref y 'swig-this))\n", NIL);
       } else {
           Printv(closcode, " ':swig-set ", chickenPrimitiveName(setfunc), ")\n", NIL);
       }