Index: bin/mailjam-mta
===================================================================
--- bin/mailjam-mta	(revision 16)
+++ bin/mailjam-mta	(revision 16)
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+#
+# Run the Postman MTA client
+
+import sys
+from postman.mta import MTAClient
+
+def usage():
+    print """
+    Usage: postman-mta address < raw_email_data
+
+    address is a valid mailing list address
+
+    raw_email_data is the raw data (txt) that contains the information of
+    the email to be sent
+    """
+    return True
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        usage()
+        raise SystemExit
+    try:
+        raw_email = sys.stdin.read()
+    except:
+        usage()
+        raise SystemExit
+    mta_client = MTAClient(address=sys.argv[1])
+    mta_client.get_raw_email(raw_email)
+    mta_client.run()
+
Index: bin/mailjam-server
===================================================================
--- bin/mailjam-server	(revision 16)
+++ bin/mailjam-server	(revision 16)
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+#
+# Run the Postman XML-RPC server
+
+from postman.daemon import PostmanDaemon
+
+if __name__ == '__main__':
+    daemon = PostmanDaemon()
+    daemon.run()
Index: bin/postman-mta
===================================================================
--- bin/postman-mta	(revision 15)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#!/usr/bin/env python
-#
-# Run the Postman MTA client
-
-import sys
-from postman.mta import MTAClient
-
-def usage():
-    print """
-    Usage: postman-mta address < raw_email_data
-
-    address is a valid mailing list address
-
-    raw_email_data is the raw data (txt) that contains the information of
-    the email to be sent
-    """
-    return True
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        usage()
-        raise SystemExit
-    try:
-        raw_email = sys.stdin.read()
-    except:
-        usage()
-        raise SystemExit
-    mta_client = MTAClient(address=sys.argv[1])
-    mta_client.get_raw_email(raw_email)
-    mta_client.run()
-
Index: bin/postman-server
===================================================================
--- bin/postman-server	(revision 15)
+++ 	(revision )
@@ -1,9 +1,0 @@
-#!/usr/bin/env python
-#
-# Run the Postman XML-RPC server
-
-from postman.daemon import PostmanDaemon
-
-if __name__ == '__main__':
-    daemon = PostmanDaemon()
-    daemon.run()
Index: bin/run_tests
===================================================================
--- bin/run_tests	(revision 10)
+++ bin/run_tests	(revision 16)
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 #
-# Run the tests for the postman package
+# Run the tests for the mailjam package
 
 import os, shutil, sys, unittest
 
 try:
-    from postman.tests import *
+    from mailjam.tests import *
 except ImportError:
     sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
     try:
-        from postman.tests import *
+        from mailjam.tests import *
     except ImportError:
-        raise SystemExit('Could not find postman on your filesystem')
+        raise SystemExit('Could not find mailjam on your filesystem')
 
 try:
@@ -18,4 +18,4 @@
 finally:
     # FIXME: hardcoded path to the tmp directory, we should read this path
-    # from postman/tests/postman.conf
-    shutil.rmtree('/tmp/postman-tests')
+    # from mailjam/tests/mailjam.conf
+    shutil.rmtree('/tmp/mailjam-tests')