diff --git a/java/jni/Makefile.am b/java/jni/Makefile.am
index 3d1d3b4..f66b91f 100644
--- a/java/jni/Makefile.am
+++ b/java/jni/Makefile.am
@@ -1,10 +1,10 @@
 if ENABLE_JNI
 if JAVA_HOME_SET
-lib_LTLIBRARIES = libciscojest.la
+lib_LTLIBRARIES = libjest.la
 AM_CFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(SSL_CFLAGS) -I../.. -I$(srcdir)/../../src 
-libciscojest_la_LDFLAGS = -release $(PACKAGE_VERSION) 
-libciscojest_la_SOURCES = client.c
-libciscojest_la_LIBADD = ../../src/est/libest.la 
+libjest_la_LDFLAGS = -release $(PACKAGE_VERSION) 
+libjest_la_SOURCES = client.c
+libjest_la_LIBADD = ../../src/est/libest.la 
 library_includedir=$(includedir)/est
 library_include_HEADERS = jest.h
 #EXTRA_DIST = jest.h 
diff --git a/java/jni/Makefile.in b/java/jni/Makefile.in
index 7a4ef9b..3389761 100644
--- a/java/jni/Makefile.in
+++ b/java/jni/Makefile.in
@@ -123,22 +123,21 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(library_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libciscojest_la_DEPENDENCIES =  \
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libjest_la_DEPENDENCIES =  \
 @ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@	../../src/est/libest.la
-am__libciscojest_la_SOURCES_DIST = client.c
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@am_libciscojest_la_OBJECTS =  \
+am__libjest_la_SOURCES_DIST = client.c
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@am_libjest_la_OBJECTS =  \
 @ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@	client.lo
-libciscojest_la_OBJECTS = $(am_libciscojest_la_OBJECTS)
+libjest_la_OBJECTS = $(am_libjest_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libciscojest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libciscojest_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@am_libciscojest_la_rpath =  \
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@	-rpath $(libdir)
+libjest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libjest_la_LDFLAGS) $(LDFLAGS) -o $@
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@am_libjest_la_rpath = -rpath \
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@	$(libdir)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -173,8 +172,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libciscojest_la_SOURCES)
-DIST_SOURCES = $(am__libciscojest_la_SOURCES_DIST)
+SOURCES = $(libjest_la_SOURCES)
+DIST_SOURCES = $(am__libjest_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -316,11 +315,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@lib_LTLIBRARIES = libciscojest.la
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@lib_LTLIBRARIES = libjest.la
 @ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@AM_CFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(SSL_CFLAGS) -I../.. -I$(srcdir)/../../src 
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libciscojest_la_LDFLAGS = -release $(PACKAGE_VERSION) 
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libciscojest_la_SOURCES = client.c
-@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libciscojest_la_LIBADD = ../../src/est/libest.la 
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libjest_la_LDFLAGS = -release $(PACKAGE_VERSION) 
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libjest_la_SOURCES = client.c
+@ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@libjest_la_LIBADD = ../../src/est/libest.la 
 @ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@library_includedir = $(includedir)/est
 @ENABLE_JNI_TRUE@@JAVA_HOME_SET_TRUE@library_include_HEADERS = jest.h
 all: all-am
@@ -393,8 +392,8 @@ clean-libLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libciscojest.la: $(libciscojest_la_OBJECTS) $(libciscojest_la_DEPENDENCIES) $(EXTRA_libciscojest_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libciscojest_la_LINK) $(am_libciscojest_la_rpath) $(libciscojest_la_OBJECTS) $(libciscojest_la_LIBADD) $(LIBS)
+libjest.la: $(libjest_la_OBJECTS) $(libjest_la_DEPENDENCIES) $(EXTRA_libjest_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libjest_la_LINK) $(am_libjest_la_rpath) $(libjest_la_OBJECTS) $(libjest_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/java/src/build.xml b/java/src/build.xml
index 4a158bd..d863a8b 100644
--- a/java/src/build.xml
+++ b/java/src/build.xml
@@ -3,22 +3,22 @@
               Any modifications will be overwritten.
               To include a user specific buildfile here, simply create one in the same
               directory with the processing instruction <?eclipse.ant.import?>
-              as the first entry and export the buildfile again. --><project basedir="." default="build" name="CiscoJEST">
+              as the first entry and export the buildfile again. --><project basedir="." default="build" name="JEST">
     <property environment="env"/>
-    <property name="CiscoJEST_Test.location" value="../test"/>
+    <property name="JEST_Test.location" value="../test"/>
     <property name="ECLIPSE_HOME" value="../../../../../../../../usr/lib/eclipse"/>
     <property name="junit.output.dir" value="junit"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.7"/>
     <property name="source" value="1.7"/>
-    <path id="libciscojest.userclasspath"/>
+    <path id="libjest.userclasspath"/>
     <path id="JUnit 4.libraryclasspath">
         <pathelement location="../lib/junit.jar"/>
         <pathelement location="../lib/org.hamcrest.core_1.1.0.jar"/>
     </path>
-    <path id="CiscoJEST.classpath">
+    <path id="JEST.classpath">
         <pathelement location="bin"/>
-        <path refid="libciscojest.userclasspath"/>
+        <path refid="libjest.userclasspath"/>
         <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="../lib/bcpkix-jdk15on-151.jar"/>
         <pathelement location="../lib/bcprov-ext-jdk15on-151.jar"/>
@@ -41,12 +41,12 @@
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
             <src path="."/>
-            <classpath refid="CiscoJEST.classpath"/>
+            <classpath refid="JEST.classpath"/>
         </javac>
     </target>
     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
-        <ant antfile="build2.xml" dir="${CiscoJEST_Test.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build2.xml" dir="${CiscoJEST_Test.location}" inheritAll="false" target="build">
+        <ant antfile="build2.xml" dir="${JEST_Test.location}" inheritAll="false" target="clean"/>
+        <ant antfile="build2.xml" dir="${JEST_Test.location}" inheritAll="false" target="build">
             <propertyset>
                 <propertyref name="build.compiler"/>
             </propertyset>
@@ -70,8 +70,8 @@
         <junit fork="yes" printsummary="withOutAndErr">
             <formatter type="xml"/>
             <test name="com.cisco.c3m.est.test.UT.PKCS10CertificateRequestTest" todir="${junit.output.dir}"/>
-            <env key="LD_LIBRARY_PATH" value="/usr/local/java/jdk1.7.0_45/jre/lib/i386/client:/usr/local/java/jdk1.7.0_45/jre/lib/i386:/usr/local/est/lib:/home/foleyj/Iron/sprint2/US1119/iron_ciscoest/java/jni/Debug"/>
-            <classpath refid="CiscoJEST.classpath"/>
+            <env key="LD_LIBRARY_PATH" value="/usr/local/java/jdk1.7.0_45/jre/lib/i386/client:/usr/local/java/jdk1.7.0_45/jre/lib/i386:/usr/local/est/lib"/>
+            <classpath refid="JEST.classpath"/>
         </junit>
     </target>
     <target name="junitreport">
diff --git a/java/src/buildjar.xml b/java/src/buildjar.xml
index 822e981..89f79cc 100644
--- a/java/src/buildjar.xml
+++ b/java/src/buildjar.xml
@@ -21,6 +21,6 @@
               <attribute name="Version-Micro" value="${rmicro}" />
               <attribute name="SVN-Revision" value="${svnr}" />
     </manifest>
-    <jar jarfile="bin/ciscojest.jar" manifest="bin/MANIFEST.MF" basedir="./bin" includes="com/cisco/c3m/est/*.class" />
+    <jar jarfile="bin/jest.jar" manifest="bin/MANIFEST.MF" basedir="./bin" includes="com/cisco/c3m/est/*.class" />
   </target>
 </project>
diff --git a/java/src/com/cisco/c3m/est/ESTClient.java b/java/src/com/cisco/c3m/est/ESTClient.java
index 6d3ec01..2dedf1a 100644
--- a/java/src/com/cisco/c3m/est/ESTClient.java
+++ b/java/src/com/cisco/c3m/est/ESTClient.java
@@ -716,7 +716,7 @@ public ArrayList<X509Certificate> fetchLatestCACerts()
 	 * Everything below is the JNI layer definitions and mgmt
 	 */
 	static {
-		System.loadLibrary("ciscojest");
+		System.loadLibrary("jest");
 		/*
 		 * Get the maximum allowed certificate length from the JNI layer and
 		 * cache it locally.  This is needed later when allocating the byte
diff --git a/java/src/com/cisco/c3m/est/PKCS10CertificateRequest.java b/java/src/com/cisco/c3m/est/PKCS10CertificateRequest.java
index 3474667..b67457f 100644
--- a/java/src/com/cisco/c3m/est/PKCS10CertificateRequest.java
+++ b/java/src/com/cisco/c3m/est/PKCS10CertificateRequest.java
@@ -168,7 +168,7 @@ public byte[] getBytes(Encoding enc) throws EncodingException, IOException {
 	 * Everything below is the JNI layer definitions and mgmt
 	 */
 	static {
-		System.loadLibrary("ciscojest");
+		System.loadLibrary("jest");
 	}
 
 	private static native int create_csr(byte[] keypair,
diff --git a/java/src/runjunit.xml b/java/src/runjunit.xml
index 6d0415a..65742fa 100644
--- a/java/src/runjunit.xml
+++ b/java/src/runjunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="UT" name="CiscoJEST Unit Test">
+<project default="UT" name="JEST Unit Test">
 	<target name="UT">
 		<junit fork="yes" printsummary="on">
 		    <sysproperty key="java.library.path" value="/usr/local/est/lib"/>
@@ -13,7 +13,7 @@
 				</pathelement>
 				<pathelement location="../lib/org.hamcrest.core_1.1.0.jar">
 				</pathelement>
-				<pathelement location="bin/ciscojest.jar">
+				<pathelement location="bin/jest.jar">
 				</pathelement>
 				<pathelement location="bin">
 				</pathelement>