diff --git a/.gitignore b/.gitignore
index 53b6187e7..8aff2c699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,8 +164,8 @@ Examples/test-suite/ocaml/*.cm*
 Examples/test-suite/ocaml/runme
 !Examples/test-suite/ocaml/*runme.ml
 Examples/ocaml/**/example.ml*
-Examples/ocaml/**/example
-Examples/ocaml/**/example_top
+Examples/ocaml/**/runme
+Examples/ocaml/**/runme_top
 Examples/ocaml/**/*.cm*
 Examples/ocaml/**/swig.ml*
 Examples/ocaml/**/swigp4.ml
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 3595120da..6d6dc95af 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -919,7 +919,7 @@ ocaml_static: $(SRCDIR_SRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
+	$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
 
 ocaml_dynamic: $(SRCDIR_SRCS)
 	$(OCAMLCORE)
@@ -931,7 +931,7 @@ ocaml_dynamic: $(SRCDIR_SRCS)
 	rm $(INTERFACE:%.i=%.mli)
 	$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCAMLFIND) $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) swig.cmo -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
+	$(NOLINK) || $(OCAMLFIND) $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
 
 ocaml_static_toplevel: $(SRCDIR_SRCS)
 	$(OCAMLCORE)
@@ -940,7 +940,7 @@ ocaml_static_toplevel: $(SRCDIR_SRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(TARGET)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
+	$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
 
 ocaml_static_cpp: $(SRCDIR_SRCS)
 	$(OCAMLCORE)
@@ -950,7 +950,7 @@ ocaml_static_cpp: $(SRCDIR_SRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
+	$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(RUNME) swig.cmo $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
 
 ocaml_static_cpp_toplevel: $(SRCDIR_SRCS)
 	$(OCAMLCORE)
@@ -960,7 +960,7 @@ ocaml_static_cpp_toplevel: $(SRCDIR_SRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(TARGET)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
+	$(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
 
 ocaml_dynamic_cpp: $(SRCDIR_SRCS)
 	$(OCAMLCORE)
@@ -973,14 +973,14 @@ ocaml_dynamic_cpp: $(SRCDIR_SRCS)
 	rm $(INTERFACE:%.i=%.mli)
 	$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
 	test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE)
-	$(NOLINK) || $(OCAMLFIND) swig.cmo $(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom -o $(TARGET) -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings'
+	$(NOLINK) || $(OCAMLFIND) swig.cmo $(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom -o $(RUNME) -package dl -linkpkg $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings'
 
 # -----------------------------------------------------------------
 # Run ocaml example
 # -----------------------------------------------------------------
 
 ocaml_run:
-	$(RUNTOOL) ./$(TARGET) $(RUNPIPE)
+	$(RUNTOOL) ./$(RUNME) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display
diff --git a/Examples/ocaml/argout_ref/Makefile b/Examples/ocaml/argout_ref/Makefile
index 8b7fc959e..d8c8e9056 100644
--- a/Examples/ocaml/argout_ref/Makefile
+++ b/Examples/ocaml/argout_ref/Makefile
@@ -5,7 +5,7 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 MLFILE     = example.ml
-PROGFILE   = example_prog.ml
+PROGFILE   = runme.ml
 OBJS       = example.o
 
 check: build
diff --git a/Examples/ocaml/argout_ref/example_prog.ml b/Examples/ocaml/argout_ref/runme.ml
similarity index 95%
rename from Examples/ocaml/argout_ref/example_prog.ml
rename to Examples/ocaml/argout_ref/runme.ml
index b91285c1c..cb9a94255 100644
--- a/Examples/ocaml/argout_ref/example_prog.ml
+++ b/Examples/ocaml/argout_ref/runme.ml
@@ -1,4 +1,4 @@
-(* example_prog.ml *)
+(* runme.ml *)
 
 open Swig
 open Example
diff --git a/Examples/ocaml/check.list b/Examples/ocaml/check.list
index 1f1e6e709..bcc63fa7f 100644
--- a/Examples/ocaml/check.list
+++ b/Examples/ocaml/check.list
@@ -8,3 +8,4 @@ shapes
 contract
 scoped_enum
 string_from_ptr
+strings_test
diff --git a/Examples/ocaml/contract/Makefile b/Examples/ocaml/contract/Makefile
index c77e6dcc4..868dc82b2 100644
--- a/Examples/ocaml/contract/Makefile
+++ b/Examples/ocaml/contract/Makefile
@@ -5,7 +5,7 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 MLFILE     = example.ml
-PROGFILE   = example_prog.ml
+PROGFILE   = runme.ml
 OBJS       =
 
 check: build
diff --git a/Examples/ocaml/contract/example_prog.ml b/Examples/ocaml/contract/runme.ml
similarity index 100%
rename from Examples/ocaml/contract/example_prog.ml
rename to Examples/ocaml/contract/runme.ml
diff --git a/Examples/ocaml/scoped_enum/Makefile b/Examples/ocaml/scoped_enum/Makefile
index 9655c98e6..0fa3af226 100644
--- a/Examples/ocaml/scoped_enum/Makefile
+++ b/Examples/ocaml/scoped_enum/Makefile
@@ -5,7 +5,7 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 MLFILE     = example.ml
-PROGFILE   = example_prog.ml
+PROGFILE   = runme.ml
 OBJS       =
 
 check: build
diff --git a/Examples/ocaml/scoped_enum/example_prog.ml b/Examples/ocaml/scoped_enum/runme.ml
similarity index 100%
rename from Examples/ocaml/scoped_enum/example_prog.ml
rename to Examples/ocaml/scoped_enum/runme.ml
diff --git a/Examples/ocaml/shapes/Makefile b/Examples/ocaml/shapes/Makefile
index 8aa35d79f..d34b48738 100644
--- a/Examples/ocaml/shapes/Makefile
+++ b/Examples/ocaml/shapes/Makefile
@@ -6,7 +6,7 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 MLFILE     = example.ml
-PROGFILE   = example_prog.ml
+PROGFILE   = runme.ml
 OBJS       = example.o
 
 check: build
diff --git a/Examples/ocaml/shapes/example_prog.ml b/Examples/ocaml/shapes/runme.ml
similarity index 98%
rename from Examples/ocaml/shapes/example_prog.ml
rename to Examples/ocaml/shapes/runme.ml
index b9e35158a..a7a2f9374 100644
--- a/Examples/ocaml/shapes/example_prog.ml
+++ b/Examples/ocaml/shapes/runme.ml
@@ -1,4 +1,4 @@
-(* example_prog.ml *)
+(* runme.ml *)
 
 open Swig ;;
 open Example ;;
diff --git a/Examples/ocaml/simple/Makefile b/Examples/ocaml/simple/Makefile
index 88fef7435..bec1526f1 100644
--- a/Examples/ocaml/simple/Makefile
+++ b/Examples/ocaml/simple/Makefile
@@ -5,7 +5,7 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 MLFILE     = example.ml
-PROGFILE   = example_prog.ml
+PROGFILE   = runme.ml
 OBJS       = example.o
 
 check: build
diff --git a/Examples/ocaml/simple/example_prog.ml b/Examples/ocaml/simple/runme.ml
similarity index 95%
rename from Examples/ocaml/simple/example_prog.ml
rename to Examples/ocaml/simple/runme.ml
index cc3b973d8..4f7a407ef 100644
--- a/Examples/ocaml/simple/example_prog.ml
+++ b/Examples/ocaml/simple/runme.ml
@@ -1,4 +1,4 @@
-(* example_prog.ml *)
+(* runme.ml *)
 
 open Swig
 open Example
diff --git a/Examples/ocaml/std_vector/runme.ml b/Examples/ocaml/std_vector/runme.ml
index feb70dd5e..0f5519b6f 100644
--- a/Examples/ocaml/std_vector/runme.ml
+++ b/Examples/ocaml/std_vector/runme.ml
@@ -14,7 +14,7 @@ let print_DoubleVector v =
       (fun v i -> 
 	 print_float ((v '[i to int]) as float) ;
 	 print_string " ") ;
-    print_endline 
+    print_endline ""
   end
 
 (* Call average with a Ocaml array... *)
@@ -27,7 +27,7 @@ let rec fill_dv v x =
       fill_dv v (x *. x)
     end
 let _ = fill_dv v 0.999
-let _ = print_DoubleVector v ; print_endline ""
+let _ = print_DoubleVector v
 let u = new_IntVector '()
 let _ = for i = 1 to 4 do
   u -> push_back ((i to int))
diff --git a/Examples/ocaml/string_from_ptr/Makefile b/Examples/ocaml/string_from_ptr/Makefile
index 9987d0052..3433022a8 100644
--- a/Examples/ocaml/string_from_ptr/Makefile
+++ b/Examples/ocaml/string_from_ptr/Makefile
@@ -4,9 +4,9 @@ SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
 SWIGOPT    = -c++
 SRCS       =
 TARGET     = example
-INTERFACE  = foolib.i
-MLFILE     = foolib.ml
-PROGFILE   = example_prog.ml
+INTERFACE  = example.i
+MLFILE     = example.ml
+PROGFILE   = runme.ml
 OBJS       =
 
 check: build
diff --git a/Examples/ocaml/string_from_ptr/foolib.i b/Examples/ocaml/string_from_ptr/example.i
similarity index 94%
rename from Examples/ocaml/string_from_ptr/foolib.i
rename to Examples/ocaml/string_from_ptr/example.i
index 86e0880eb..d66487940 100644
--- a/Examples/ocaml/string_from_ptr/foolib.i
+++ b/Examples/ocaml/string_from_ptr/example.i
@@ -1,4 +1,4 @@
-%module foolib
+%module example
 %{
 static int foo( char **buf ) {
   *buf = "string from c";
diff --git a/Examples/ocaml/string_from_ptr/example_prog.ml b/Examples/ocaml/string_from_ptr/runme.ml
similarity index 88%
rename from Examples/ocaml/string_from_ptr/example_prog.ml
rename to Examples/ocaml/string_from_ptr/runme.ml
index 8069dc228..039762017 100644
--- a/Examples/ocaml/string_from_ptr/example_prog.ml
+++ b/Examples/ocaml/string_from_ptr/runme.ml
@@ -1,7 +1,5 @@
-(* foo_program.ml -- the program using foolib *)
-
 open Swig    (* Give access to the swig library *)
-open Foolib  (* This is the name of your swig output *)
+open Example (* This is the name of your swig output *)
 
 let results = _foo '()  (* Function names are prefixed with _ in order to make
 			   them lex as identifiers in ocaml.  Consider that
diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in
index 879682f10..0fe1533d1 100644
--- a/Examples/test-suite/ocaml/Makefile.in
+++ b/Examples/test-suite/ocaml/Makefile.in
@@ -21,6 +21,7 @@ default_constructor \
 director_binary_string \
 director_enum \
 director_exception \
+director_exception_nothrow \
 director_ignore \
 director_nested \
 director_pass_by_value \
@@ -30,6 +31,7 @@ director_redefined \
 director_string \
 director_using \
 enum_thorough \
+li_windows \
 member_pointer_const \
 minherit \
 nested_directors \