diff --git a/.gitignore b/.gitignore
index 59107315a8a321529d96c0a99b6084aaa11f1547..aec448c68f468fd89930aee4cbd90bfebc67d17e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ GenCompiler.class
 Parser.class
 GenCompiler.ja
 GenCompiler.jar
+OntologyCompiler.jar
diff --git a/Rewrites.jrag b/Rewrites.jrag
index 24d5f9cf924c9b0f31d604cbb63de18197455ee8..3bbd2aa7ffd6491000325a804977d935a8781444 100644
--- a/Rewrites.jrag
+++ b/Rewrites.jrag
@@ -30,13 +30,16 @@ aspect MiscUtilities {
 
     syn lazy String Attribute.trim() {
 		String s = getValue().getSTRING_LITERAL();
-		s.replaceAll("&iml;","");
+		s = s.replaceAll("-","_");
 		if (s.indexOf('"') == 0) {
 			s = s.substring(1,s.length()-1).trim();
 		} 
 		if (s.indexOf('#') > -1) {
 			s = s.substring(s.indexOf('#')+1,s.length()).trim();
 		} 
+		if (s.indexOf(';') > -1) {
+			s = s.substring(s.indexOf(';')+1,s.length()).trim();
+		} 
 		return s.trim();
     }
 
diff --git a/build.xml b/build.xml
index 5666f3a84f6a5d2679b9717fc998f87036436b58..643db5d4fe3d13f6cf6dd3029a673c9e32c12c1b 100644
--- a/build.xml
+++ b/build.xml
@@ -117,7 +117,7 @@
   </target>
 
   <target name="jar" depends="build">
-    <jar destfile="GenCompiler.jar" basedir="." includes="**/*.class" excludes="test/**">
+    <jar destfile="OntologyCompiler.jar" basedir="." includes="**/*.class" excludes="test/**">
       <manifest>
 	<attribute name="Main-Class" value="GenCompiler"/>
       </manifest>