diff --git a/debian/rules b/debian/rules
index 7d576bc05..dce9c1b46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,9 +28,9 @@ install-stamp: build-stamp
 	cd debian/tmp && install -d `cat ../dirs`
 	make install PREFIX=/usr DESTDIR=`pwd`/debian/tmp
 	cp gajim.xpm debian/tmp/usr/share/pixmaps
-	chmod -x debian/tmp/usr/share/gajim/runCore.py
-	sed -ne '1d;w debian/tmp/runCore.py.tmp' debian/tmp/usr/share/gajim/runCore.py
-	mv debian/tmp/runCore.py.tmp debian/tmp/usr/share/gajim/runCore.py
+	chmod -x debian/tmp/usr/share/gajim/gajim.py
+	sed -ne '1d;w debian/tmp/gajim.py.tmp' debian/tmp/usr/share/gajim/gajim.py
+	mv debian/tmp/gajim.py.tmp debian/tmp/usr/share/gajim/gajim.py
 
 binary-indep: checkroot build
 	$(checkdir)
diff --git a/runCore.py b/gajim.py
similarity index 98%
rename from runCore.py
rename to gajim.py
index c54a3697b..60ba16aab 100755
--- a/runCore.py
+++ b/gajim.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-##	runCore.py
+##	gajim.py
 ##
 ## Gajim Team:
 ## 	- Yann Le Boulanger <asterix@lagaule.org>
diff --git a/scripts/gajim b/scripts/gajim
index b0a02bff5..085fab0ae 100644
--- a/scripts/gajim
+++ b/scripts/gajim
@@ -22,4 +22,4 @@ if [ `id -u` -eq 0 ]; then
 fi
 
 cd PREFIX/share/gajim
-python runCore.py
+python gajim.py
diff --git a/setup_win32.py b/setup_win32.py
index 5bfea1db7..a6256fe24 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -40,8 +40,8 @@ opts = {
 setup(
     name = "Gajim",
     description = "A jabber client",
-#    console=["runCore.py"],
-    windows = [{"script": "runCore.py"}],
+#    console=["gajim.py"],
+    windows = [{"script": "gajim.py"}],
     options=opts,
     data_files=[("plugins/gtkgui", glob.glob("plugins/gtkgui/gtkgui.glade")),
                 ("plugins/gtkgui/icons/sun", glob.glob("plugins/gtkgui/icons/sun/*.*")),