diff --git a/Jamfile b/Jamfile
index 42d9ad1..ceb3e95 100644
--- a/Jamfile
+++ b/Jamfile
@@ -25,7 +25,7 @@ SubInclude TOP ede-desktop ;
 SubInclude TOP ede-desktop-conf ;
 SubInclude TOP ede-screensaver-conf ;
 SubInclude TOP ede-help ;
-SubInclude TOP eimage ;
+SubInclude TOP ede-image-view ;
 SubInclude TOP elma ;
 SubInclude TOP ede-launch ;
 SubInclude TOP emountd ;
diff --git a/ede-image-view/Jamfile b/ede-image-view/Jamfile
index 9ae7725..7bf9a45 100644
--- a/ede-image-view/Jamfile
+++ b/ede-image-view/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP eimage ;
+SubDir TOP ede-image-view ;
 
-FltkProgram eimage : eimage.cpp ;
-TranslationStrings locale : eimage.cpp ;
+FltkProgram ede-image-view : ede-image-view.cpp ;
+TranslationStrings locale  : ede-image-view.cpp ;
diff --git a/ede-image-view/ede-image-view.cpp b/ede-image-view/ede-image-view.cpp
index 2a3e440..595c01b 100644
--- a/ede-image-view/ede-image-view.cpp
+++ b/ede-image-view/ede-image-view.cpp
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * EImage - EDE Image Viewer
+ * ede-image-view, EDE image viewer
  * Part of Equinox Desktop Environment (EDE).
  * Copyright (c) 2006-2007 EDE Authors.
  *
@@ -373,7 +373,7 @@ int main (int argc, char **argv) {
 	else {
 		if (strcmp(argv[unknown],"--help")==0) {
 			printf(_("EImage - EDE Image Viewer\nPart of Equinox Desktop Environment (EDE).\nCopyright (c) 2000-2007 EDE Authors.\n\nThis program is licenced under terms of the\nGNU General Public Licence version 2 or newer.\nSee COPYING for details.\n\n"));
-			printf(_("Usage:\n\teimage [OPTIONS] [IMAGE_FILE]\n\n"));
+			printf(_("Usage: ede-image-view [OPTIONS] [IMAGE_FILE]\n\n"));
 			printf(_("Available options:\n%s\n"),Fl::help);
 			return 1;
 		}