diff --git a/src/Makefile b/src/Makefile
index 6972a1723..5038ea6e6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,18 +38,18 @@ install-java: javac
 	ln -s ../src/java ../bin
 	@echo "PLEASE edit GFHOME in bin/jgf2"
 opt:
-	$(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf2
-	strip gf2
-	mv gf2 ../bin/
+	$(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf
+	strip gf
+	mv gf ../bin/
 
 ghc: nofud
 
 ghci: nofud-links ghci-nofud
 
 fud:
-	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) $(GHCFUDFLAG) GF.hs -o gf2+
-	strip gf2+
-	mv gf2+ ../bin/
+	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) $(GHCFUDFLAG) GF.hs -o gf+
+	strip gf+
+	mv gf+ ../bin/
 
 gft:
 	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) -itranslate translate/GFT.hs -o gft
@@ -57,14 +57,14 @@ gft:
 	mv gft ../bin/
 
 nofud: nofud-links
-	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf2
-	strip gf2
-	mv gf2 ../bin/
+	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf
+	strip gf
+	mv gf ../bin/
 
 justwindows:
-	$(GHMAKE) $(GHCOPTFLAGS) $(WINDOWSINCLUDE) GF.hs -o gf2.exe
-	strip gf2.exe
-	mv gf2.exe ../bin/
+	$(GHMAKE) $(GHCOPTFLAGS) $(WINDOWSINCLUDE) GF.hs -o gf.exe
+	strip gf.exe
+	mv gf.exe ../bin/
 
 nofud-links:
 	mkdir -p for-ghc-nofud
@@ -73,8 +73,8 @@ nofud-links:
 	ln -s ../for-hugs/ArchEdit.hs for-ghc-nofud
 
 batch: 
-	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF2.hs -o gf2
-	strip gf2
+	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF2.hs -o gf
+	strip gf
 
 api: 
 	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) API.hs
@@ -86,7 +86,8 @@ clean:
 
 distclean: clean
 	-rm -f for-ghc-nofud/*.hs
-	-rm -f java/gf-java.jar jgf2
+	-rm -f java/gf-java.jar jgf
+	-rm -f util/gfdoc
 	-rm -f config.status config.mk config.log
 	-rm -f *.tar.gz *.zip
 
@@ -107,9 +108,9 @@ help:
 
 # added by peb:
 tracing:
-	$(GHMAKE) $(GHCFLAGS) -itrace $(GHCINCLUDENOFUD) GF.hs -o gf2
-	strip gf2
-	mv gf2 ../bin/
+	$(GHMAKE) $(GHCFLAGS) -itrace $(GHCINCLUDENOFUD) GF.hs -o gf
+	strip gf
+	mv gf ../bin/
 
 dist:
 	-rm -rf $(DIST_DIR)
@@ -125,9 +126,9 @@ dist:
 rpm: dist
 	rpmbuild -ta $(DIST_DIR).tar.gz
 
-install-gf2:
+install-gf:
 	$(INSTALL) -d $(bindir)
-	$(INSTALL) ../bin/gf2 $(bindir)
+	$(INSTALL) ../bin/gf $(bindir)
 
 install-gfdoc: 
 	$(INSTALL) -d $(bindir)
@@ -135,10 +136,10 @@ install-gfdoc:
 
 install-editor:
 	$(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION)
-	$(INSTALL) jgf2 $(bindir)
+	$(INSTALL) jgf $(bindir)
 	$(INSTALL) java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION)
 
-install: install-gf2 install-gfdoc install-editor
+install: install-gf install-gfdoc install-editor
 
 gfdoc:
 	cd util ; $(GHMAKE) GFDoc.hs -o gfdoc ; cd ..
diff --git a/src/configure.ac b/src/configure.ac
index 08b0a85a4..8a9cb31c2 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,12 +1,12 @@
 dnl Run autoconf to generate configure from this file
 
-AC_INIT([GF],[2.0],[dp03-7@mdstud.chalmers.se],[GF])
+AC_INIT([GF],[2.0],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.2 $)
+AC_REVISION($Revision: 1.3 $)
 
-AC_CONFIG_FILES([config.mk jgf2])
+AC_CONFIG_FILES([config.mk jgf])
 
 AC_CANONICAL_SYSTEM
 
diff --git a/src/gf.spec b/src/gf.spec
index 76ce3dc78..9e19a13db 100644
--- a/src/gf.spec
+++ b/src/gf.spec
@@ -58,9 +58,9 @@ cd src
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{_bindir}/gf2
+%{_bindir}/gf
 %{_bindir}/gfdoc
-%{_bindir}/jgf2
+%{_bindir}/jgf
 %{_libdir}/%{name}-%{version}/gf-java.jar
 %doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html}
 
diff --git a/src/jgf2.in b/src/jgf.in
similarity index 100%
rename from src/jgf2.in
rename to src/jgf.in