diff --git a/SWIG/Examples/chicken/class/Makefile b/SWIG/Examples/chicken/class/Makefile
index 61206dca3..e33ea0ba2 100644
--- a/SWIG/Examples/chicken/class/Makefile
+++ b/SWIG/Examples/chicken/class/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       =
 CXXSRCS    = example_wrap.cxx example.cxx
@@ -17,27 +18,27 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.cxx example.scm example-generic.scm example-clos.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_cpp
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_cpp
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
 		CHICKSRCS='$(CHICKSRCS)' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
 		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_static
+		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_static_cpp
 
 module:: $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
 		CHICKSRCS='$(CHICKSRCS)' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
 		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='module' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_module
+		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_module_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module
diff --git a/SWIG/Examples/chicken/constants/Makefile b/SWIG/Examples/chicken/constants/Makefile
index 5f8dbd1ee..916a7c4e0 100644
--- a/SWIG/Examples/chicken/constants/Makefile
+++ b/SWIG/Examples/chicken/constants/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       = example_wrap.c
 CXXSRCS    = 
@@ -17,15 +18,15 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.c example.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_c
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_c
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module
\ No newline at end of file
diff --git a/SWIG/Examples/chicken/multimap/Makefile b/SWIG/Examples/chicken/multimap/Makefile
index c8b17ad0c..aeedef781 100644
--- a/SWIG/Examples/chicken/multimap/Makefile
+++ b/SWIG/Examples/chicken/multimap/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       = example.c example_wrap.c
 CXXSRCS    = 
@@ -17,19 +18,19 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.c example.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_c
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_c
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
-		CHICKSRCS='$(CHICKSRCS)' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
+		CHICKSRCS='$(CHICKSRCS) csi.c' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
 		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_static
 
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module
diff --git a/SWIG/Examples/chicken/overload/Makefile b/SWIG/Examples/chicken/overload/Makefile
index b7d409573..9f127687c 100644
--- a/SWIG/Examples/chicken/overload/Makefile
+++ b/SWIG/Examples/chicken/overload/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       =
 CXXSRCS    = example_wrap.cxx example.cxx
@@ -17,27 +18,27 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.cxx example.scm example-generic.scm example-clos.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_cpp
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_cpp
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
 		CHICKSRCS='$(CHICKSRCS)' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
 		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_static
+		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_static_cpp
 
 module:: $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
 		CHICKSRCS='$(CHICKSRCS)' SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' \
 		INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='module' \
-		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_module
+		SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' chicken_module_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile chicken_clean
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module
diff --git a/SWIG/Examples/chicken/simple/Makefile b/SWIG/Examples/chicken/simple/Makefile
index 07dafab5a..24a745e4c 100644
--- a/SWIG/Examples/chicken/simple/Makefile
+++ b/SWIG/Examples/chicken/simple/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       = example.c example_wrap.c
 CXXSRCS    = 
@@ -17,15 +18,15 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.c example.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_c
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_c
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile \
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module
diff --git a/SWIG/Examples/chicken/zlib/Makefile b/SWIG/Examples/chicken/zlib/Makefile
index e15cc5b12..ea882cd09 100644
--- a/SWIG/Examples/chicken/zlib/Makefile
+++ b/SWIG/Examples/chicken/zlib/Makefile
@@ -1,5 +1,6 @@
 TOP        = ../..
 SWIG       = $(TOP)/../swig
+INTERFACE  = example.i
 CHICKSRCS  = precsi.c oexample.c
 SRCS       = example_wrap.c
 CXXSRCS    = 
@@ -17,15 +18,15 @@ csi.c:
 
 precsi.c: precsi.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='precsi.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 example_wrap.c example.scm: example.i
 	$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
-		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_c
+		INCLUDE='$(INCLUDE)' INTERFACE='example.i' chicken_swig_c
 
 oexample.c: example.scm
 	$(MAKE) -f $(TOP)/Makefile TARGET='oexample.c' \
-		INTERFACE='$<' chicken
+		INTERFACE='$<' chicken_chicken
 
 $(TARGET): csi.c $(CHICKSRCS) $(SRCS) $(CXXSRCS)
 	$(MAKE) -f $(TOP)/Makefile LIBS='$(LIBS)' \
@@ -45,4 +46,4 @@ clean::
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)
 
-check:: all
+check:: module