diff --git a/Makefile b/Makefile
index c56c9bc50cb5264bd7ba901e53b7df3a5c3aa02b..f39ec573cdafc7744e251ca6318025afc7dc97b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SUBDIRS=compiler lib test examples
-export LABCOMM_JAR=$(shell pwd)/compiler/labComm.jar
+export LABCOMM_JAR=$(shell pwd)/compiler/labcomm_compiler.jar
 export LABCOMM=java -jar $(LABCOMM_JAR) 
 
 all: $(SUBDIRS:%=make-%)
diff --git a/compiler/build.xml b/compiler/build.xml
index dd0e26953c4f324177e168e02100aa1c6b65eeaa..402790ce82c5d938925c83b681ea60fa49d0ba27 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -90,7 +90,7 @@ classpath="tools/jastadd2.jar"/>
 
 
 <target name="jar" depends="build">
-  <jar destfile="labComm.jar">
+  <jar destfile="labcomm_compiler.jar">
     <fileset dir="." includes="LabComm*.class"/>
     <fileset dir="." includes="AST/*.class"/>
     <zipfileset src="tools/beaver-rt.jar" includes="beaver/*.class"/>
diff --git a/examples/duck_typing/Makefile b/examples/duck_typing/Makefile
index cd5ec76bda5723684e3892efdf82d362d598723e..2587040229b3665c25660c4e0d3995e0071bb864 100644
--- a/examples/duck_typing/Makefile
+++ b/examples/duck_typing/Makefile
@@ -1,4 +1,4 @@
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 all: gen/animal.py
diff --git a/examples/jgrafchart/Makefile b/examples/jgrafchart/Makefile
index fc468e905b01964b69d1b68d73d1887502bb88e0..2fbc37af107950d839e93cbe7207e1fc2ce05f73 100644
--- a/examples/jgrafchart/Makefile
+++ b/examples/jgrafchart/Makefile
@@ -1,9 +1,8 @@
 LCDIR=../..
-LCC=java -jar ${LCDIR}/compiler/labComm.jar
+LCC=java -jar ${LCDIR}/compiler/labcomm_compiler.jar
 CLASSPATH=.:${LCDIR}/lib/java/labcomm.jar
 JAVA_PKG=labcommTCPtest
 SAMPLENAME=foo
-LCC=java -jar ${LCDIR}/compiler/labComm.jar
 LCLIBDIR=${LCDIR}/lib/c
 
 LCFILE=jg
diff --git a/examples/tcp/Makefile b/examples/tcp/Makefile
index a96c0e1acc2f62d9a67fc4400a0b0e99ae4bda5b..18fedc5ef9ab867993683a7855f5ee15d4ea11d1 100644
--- a/examples/tcp/Makefile
+++ b/examples/tcp/Makefile
@@ -1,5 +1,5 @@
 LCDIR=../..
-LCCJAR=${LCDIR}/compiler/labComm.jar  # the LabComm compiler
+LCCJAR=${LCDIR}/compiler/labcomm_compiler.jar  # the LabComm compiler
 LCLJAR=${LCDIR}/lib/java/labcomm.jar  # the LabComm library
 JAVA_PKG=labcommTCPtest
 
diff --git a/examples/twoway/Makefile b/examples/twoway/Makefile
index 868966d6212b28ea8ef783304c128e04d4a52dbd..6c349286655b87849fdfd4ece409199bb95aa4cb 100644
--- a/examples/twoway/Makefile
+++ b/examples/twoway/Makefile
@@ -1,5 +1,5 @@
 TARGETS=client server
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 CFLAGS=-O3 -g -Wall -Werror -I../../lib/c -I. -Wno-unused-function
diff --git a/lib/c/Makefile b/lib/c/Makefile
index ca68add3c95acf90f459b3d01f3680b8ab6c5d0f..e1ba1d73614758c179f825c4c92c20477c2afd9d 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -30,7 +30,7 @@ OBJS=labcomm_memory.o \
      labcomm_pthread_scheduler.o 
 
 #FIXME: labcomm_mem_reader.o labcomm_mem_writer.o
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 TESTS=test_labcomm_basic_type_encoding test_labcomm_generated_encoding \
diff --git a/test/Makefile b/test/Makefile
index 0fe91b486994f62b4254a2d66ef35ece03947f33..075d91f72d356a61f214e4381d8178d70dc28dc8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 TESTS=basic simple nested
-LABCOMM_JAR=../compiler/labComm.jar
+LABCOMM_JAR=../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR)
 
 CFLAGS=-O3 -g -Wall -Werror -Wno-unused-function