diff --git a/release-lv6/Makefile b/release-lv6/Makefile
index 5957514445249faa4f5ce106d5a6c23cca60b576..b00f715586a15168f3b0085cf5d909278eb596c0 100644
--- a/release-lv6/Makefile
+++ b/release-lv6/Makefile
@@ -23,8 +23,8 @@ lic2c:
 
 test_files:
 	for f in $(shell find $(LUS2LICDIR)/src/test/should_work -name \*.lus); do \
-		 $(RELNAME)/bin/lus2lic $$f -o /tmp/xx.lus && \
-		 $(RELNAME)/bin/lic2c --out-format loc  /tmp/xx.lus > /dev/null && \
+		 ($(RELNAME)/bin/lus2lic $$f -o /tmp/xx.lus || (echo "*** lus2lic $$f failed" ; exit 1)) && \
+		 ($(RELNAME)/bin/lic2c --out-format loc  /tmp/xx.lus > /dev/null || (echo "*** lic2c $$f failed" ; exit 1)) && \
 		echo "cp $$f $(RELNAME)/test/" && \
 		cp $$f $(RELNAME)/test/; \
 	done
diff --git a/src/Makefile b/src/Makefile
index 335f52b8b166317435c7fabe293ed5c111f93f26..beea99d5876cefcec64d33a608ff12c38a3c1bf6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,8 +60,8 @@ SOURCES =  \
 	./split.ml \
 	./nodesExpand.mli \
 	./nodesExpand.ml \
-	./structExpand.mli \
-	./structExpand.ml \
+	./structArrayExpand.mli \
+	./structArrayExpand.ml \
 	./inline.mli \
 	./inline.ml \
 	./lazyCompiler.ml \
diff --git a/src/lazyCompiler.ml b/src/lazyCompiler.ml
index 6b6719760146f3f2a151b4ad36a5f2170be4e926..25555affb017de5fbd69a26fda33933a785c298d 100644
--- a/src/lazyCompiler.ml
+++ b/src/lazyCompiler.ml
@@ -829,7 +829,7 @@ and (node_check_do: t -> Eff.node_key -> Lxm.t -> SymbolTab.t ->
     in
     let res_struct =
       if !Global.expand_structs then 
-	let new_res = StructExpand.node local_env node_id_solver res in
+	let new_res = StructArrayExpand.node local_env node_id_solver res in
 	  UniqueOutput.check res node_def.src; 
 	  UniqueOutput.check new_res node_def.src; (* is it useful to check both?*)
 	  new_res
diff --git a/src/structExpand.ml b/src/structArrayExpand.ml
similarity index 100%
rename from src/structExpand.ml
rename to src/structArrayExpand.ml
diff --git a/src/structExpand.mli b/src/structArrayExpand.mli
similarity index 100%
rename from src/structExpand.mli
rename to src/structArrayExpand.mli