diff --git a/build.xml b/build.xml
index 5be4077..9f727b3 100644
--- a/build.xml
+++ b/build.xml
@@ -5,9 +5,6 @@
 *    Class compilation
 ****************************************************
 -->
-	<property name="source.version" value="1.6"/>
-	<property name="target.version" value="1.6"/>
-
 	<mkdir dir="build/classes"/>
 	<mkdir dir="build/classes/org/objectweb"/>
 
@@ -16,8 +13,6 @@
 		srcdir="src"
 		destdir="build/classes"
 		includeantruntime="false"
-		source="${source.version}"
-		target="${target.version}"
 		bootclasspath="${java.home}/lib/rt.jar"
 	>
 	<include name="org/objectweb/asm/**"/>
@@ -30,8 +25,6 @@
 		srcdir="src"
 		destdir="build/classes"
 		includeantruntime="false"
-		source="${source.version}"
-		target="${target.version}"
 		bootclasspath="${java.home}/lib/rt.jar"
 	>
     <exclude name="org/objectweb/**"/>
@@ -50,7 +43,7 @@
 
 	<echo message="Building JAR - AWT" />
 	<jar
-		destfile="build/freej2me.jar">
+		destfile="build/freej2me-plus.jar">
 		<fileset dir="build/classes" excludes="**/Libretro*.class"/> <!-- Exclude Libretro classes -->
 		<fileset dir="resources" />
 		<metainf dir="META-INF" />
@@ -63,7 +56,7 @@
 
 	<echo message="Building JAR - Libretro" />
 	<jar
-		destfile="build/freej2me-lr.jar">
+		destfile="build/freej2me-plus-lr.jar">
 		<fileset dir="build/classes" excludes="**/AWTGUI*.class, **/FreeJ2ME*.class, org/recompile/freej2me/ProgressBar.class, **/ScreenShot*.class"/> <!-- Exclude AWT classes (FreeJ2ME.class is only needed for AWT) -->
 		<fileset dir="resources" />
 		<metainf dir="META-INF" />
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 58dde04..c3effed 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -31,7 +31,7 @@ endif
 
 
 CORE_DIR    += .
-TARGET_NAME := freej2me
+TARGET_NAME := freej2me-plus
 LIBM		    = -lm
 
 ifeq ($(ARCHFLAGS),)
diff --git a/src/libretro/freej2me_libretro.c b/src/libretro/freej2me_libretro.c
index c2f47bd..39f02fa 100755
--- a/src/libretro/freej2me_libretro.c
+++ b/src/libretro/freej2me_libretro.c
@@ -36,7 +36,7 @@ const char *slash = path_default_slash();
 
 // These may change to .so and .dll at some point
 #ifdef __linux__
-const char *freej2meapp = "freej2me-lr.jar";
+const char *freej2meapp = "freej2me-plus-lr.jar";
 #elif _WIN32
 const char *freej2meapp = "freej2me-lr.jar";
 #endif
diff --git a/src/libretro/freej2me_libretro.info b/src/libretro/freej2me_libretro.info
index dd688e1..664cde2 100644
--- a/src/libretro/freej2me_libretro.info
+++ b/src/libretro/freej2me_libretro.info
@@ -26,8 +26,8 @@ core_options = "true"
 
 # BIOS / Firmware
 firmware_count = 1
-firmware0_desc = "freej2me-lr.jar"
-firmware0_path = "freej2me-lr.jar"
+firmware0_desc = "freej2me-plus-lr.jar"
+firmware0_path = "freej2me-plus-lr.jar"
 firmware0_opt = "false"
 
 description = "A fork of FreeJ2ME with improved compatibility and better libretro support. This core emulates Java ME applications and games for Java-based mobile phones."