diff --git a/src/bin/bemail_utils/Jamfile b/src/bin/bemail_utils/Jamfile
index 956b180129..942af0c943 100644
--- a/src/bin/bemail_utils/Jamfile
+++ b/src/bin/bemail_utils/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src bin bemail_utils ;
+SubDir HAIKU_TOP src bin mail_utils ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -9,21 +9,21 @@ if $(TARGET_PLATFORM) != haiku {
 UsePrivateHeaders mail ;
 
 StdBinCommands
-	bemailtombox.cpp
+	mail2mbox.cpp
 	: be
-	: bemailtombox.rdef
+	: mail2mbox.rdef
 	;
 Package haiku-maildaemon-cvs :
-	bemailtombox :
+	mail2mbox :
 	boot home config bin ;
 
 StdBinCommands
-	mboxtobemail.cpp
+	mbox2mail.cpp
 	: be libmail.so
-	: mboxtobemail.rdef
+	: mbox2mail.rdef
 	;
 Package haiku-maildaemon-cvs :
-	mboxtobemail :
+	mbox2mail :
 	boot home config bin ;
 
 StdBinCommands
diff --git a/src/bin/bemail_utils/bemailtombox.cpp b/src/bin/bemail_utils/mail2mbox.cpp
similarity index 99%
rename from src/bin/bemail_utils/bemailtombox.cpp
rename to src/bin/bemail_utils/mail2mbox.cpp
index 0360de5ecf..e36d6dc6f5 100644
--- a/src/bin/bemail_utils/bemailtombox.cpp
+++ b/src/bin/bemail_utils/mail2mbox.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * BeMailToMBox is a utility program (requested by Frank Zschockelt) that
  * converts BeOS e-mail files into Unix mailbox files (the kind that Pine
@@ -392,7 +392,7 @@ int main (int argc, char** argv)
     printf ("output.  Usage:\n\n");
     printf ("bemailtombox InputDirectory >OutputFile\n\n");
     printf ("Public domain, by Alexander G. M. Smith.\n");
-    printf ("$Id:$\n");
+    printf ("$Id$\n");
     printf ("$HeadURL$\n");
     return -10;
   }
diff --git a/src/bin/bemail_utils/bemailtombox.rdef b/src/bin/bemail_utils/mail2mbox.rdef
similarity index 100%
rename from src/bin/bemail_utils/bemailtombox.rdef
rename to src/bin/bemail_utils/mail2mbox.rdef
diff --git a/src/bin/bemail_utils/mboxtobemail.cpp b/src/bin/bemail_utils/mbox2mail.cpp
similarity index 99%
rename from src/bin/bemail_utils/mboxtobemail.cpp
rename to src/bin/bemail_utils/mbox2mail.cpp
index a27d78b1ee..3e8ab925e4 100644
--- a/src/bin/bemail_utils/mboxtobemail.cpp
+++ b/src/bin/bemail_utils/mbox2mail.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * MboxToBeMail is a utility program that converts Unix mailbox (mbox) files
  * (the kind that Pine uses) into e-mail files for use with BeOS.  It also
diff --git a/src/bin/bemail_utils/mboxtobemail.rdef b/src/bin/bemail_utils/mbox2mail.rdef
similarity index 100%
rename from src/bin/bemail_utils/mboxtobemail.rdef
rename to src/bin/bemail_utils/mbox2mail.rdef