rename from babel/catalog/__init__.py
rename to babel/messages/__init__.py

rename from babel/catalog/extract.py
rename to babel/messages/extract.py
--- a/babel/catalog/extract.py
+++ b/babel/messages/extract.py
@@ -51,7 +51,6 @@
     '**.py': 'python'
 }
 
-
 def extract_from_dir(dirname=os.getcwd(), method_map=DEFAULT_MAPPING,
                      options_map=None, keywords=DEFAULT_KEYWORDS,
                      callback=None):

rename from babel/catalog/frontend.py
rename to babel/messages/frontend.py
--- a/babel/catalog/frontend.py
+++ b/babel/messages/frontend.py
@@ -26,10 +26,10 @@
 from babel import __version__ as VERSION
 from babel import Locale
 from babel.core import UnknownLocaleError
-from babel.catalog.extract import extract_from_dir, DEFAULT_KEYWORDS, \
-                                  DEFAULT_MAPPING
-from babel.catalog.pofile import write_po, write_pot
-from babel.catalog.plurals import PLURALS
+from babel.messages.extract import extract_from_dir, DEFAULT_KEYWORDS, \
+                                   DEFAULT_MAPPING
+from babel.messages.pofile import write_po, write_pot
+from babel.messages.plurals import PLURALS
 
 __all__ = ['CommandLineInterface', 'extract_messages',
            'check_message_extractors', 'main']
@@ -43,7 +43,7 @@
     setup scripts automatically. For projects using plain old ``distutils``,
     the command needs to be registered explicitly in ``setup.py``::
 
-        from babel.catalog.frontend import extract_messages
+        from babel.messages.frontend import extract_messages
 
         setup(
             ...
@@ -184,7 +184,7 @@
     setup scripts automatically. For projects using plain old ``distutils``,
     the command needs to be registered explicitly in ``setup.py``::
 
-        from babel.catalog.frontend import new_catalog
+        from babel.messages.frontend import new_catalog
 
         setup(
             ...
@@ -396,9 +396,9 @@
                 for filename, lineno, funcname, message in extracted:
                     filepath = os.path.normpath(os.path.join(dirname, filename))
                     messages.append((filepath, lineno, funcname, message, None))
-            write_po(outfile, messages, width=options.width,
-                     charset=options.charset, no_location=options.no_location,
-                     omit_header=options.omit_header)
+            write_pot(outfile, messages, width=options.width,
+                      charset=options.charset, no_location=options.no_location,
+                      omit_header=options.omit_header)
         finally:
             if options.output:
                 outfile.close()

rename from babel/catalog/plurals.py
rename to babel/messages/plurals.py

rename from babel/catalog/pofile.py
rename to babel/messages/pofile.py

rename from babel/catalog/tests/__init__.py
rename to babel/messages/tests/__init__.py
--- a/babel/catalog/tests/__init__.py
+++ b/babel/messages/tests/__init__.py
@@ -14,7 +14,7 @@
 import unittest
 
 def suite():
-    from babel.catalog.tests import extract, frontend, pofile
+    from babel.messages.tests import extract, frontend, pofile
     suite = unittest.TestSuite()
     suite.addTest(extract.suite())
     suite.addTest(frontend.suite())

rename from babel/catalog/tests/extract.py
rename to babel/messages/tests/extract.py
--- a/babel/catalog/tests/extract.py
+++ b/babel/messages/tests/extract.py
@@ -15,7 +15,7 @@
 from StringIO import StringIO
 import unittest
 
-from babel.catalog import extract
+from babel.messages import extract
 
 
 class ExtractPythonTestCase(unittest.TestCase):

rename from babel/catalog/tests/frontend.py
rename to babel/messages/tests/frontend.py
--- a/babel/catalog/tests/frontend.py
+++ b/babel/messages/tests/frontend.py
@@ -14,7 +14,7 @@
 import doctest
 import unittest
 
-from babel.catalog import frontend
+from babel.messages import frontend
 
 def suite():
     suite = unittest.TestSuite()

rename from babel/catalog/tests/pofile.py
rename to babel/messages/tests/pofile.py
--- a/babel/catalog/tests/pofile.py
+++ b/babel/messages/tests/pofile.py
@@ -15,7 +15,7 @@
 from StringIO import StringIO
 import unittest
 
-from babel.catalog import pofile
+from babel.messages import pofile
 
 
 class PythonFormatFlagTestCase(unittest.TestCase):

--- a/babel/tests/__init__.py
+++ b/babel/tests/__init__.py
@@ -15,14 +15,14 @@
 
 def suite():
     from babel.tests import core, dates, localedata, numbers, util
-    from babel.catalog import tests as catalog
+    from babel.messages import tests as messages
     suite = unittest.TestSuite()
     suite.addTest(core.suite())
     suite.addTest(dates.suite())
     suite.addTest(localedata.suite())
     suite.addTest(numbers.suite())
     suite.addTest(util.suite())
-    suite.addTest(catalog.suite())
+    suite.addTest(messages.suite())
     return suite
 
 if __name__ == '__main__':

--- a/doc/setup.txt
+++ b/doc/setup.txt
@@ -15,7 +15,7 @@
 .. code-block:: python
 
     from distutils.core import setup
-    from babel.catalog import frontend as babel
+    from babel.messages import frontend as babel
     
     setup(
         ...

--- a/setup.py
+++ b/setup.py
@@ -121,24 +121,24 @@
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    packages = ['babel', 'babel.catalog'],
+    packages = ['babel', 'babel.messages'],
     package_data = {'babel': ['localedata/*.dat']},
     test_suite = 'babel.tests.suite',
 
     entry_points = """
     [console_scripts]
-    babel = babel.catalog.frontend:main
+    babel = babel.messages.frontend:main
     
     [distutils.commands]
-    extract_messages = babel.catalog.frontend:extract_messages
-    new_catalog = babel.catalog.frontend:new_catalog
+    extract_messages = babel.messages.frontend:extract_messages
+    new_catalog = babel.messages.frontend:new_catalog
     
     [distutils.setup_keywords]
-    message_extractors = babel.catalog.frontend:check_message_extractors
+    message_extractors = babel.messages.frontend:check_message_extractors
     
     [babel.extractors]
-    genshi = babel.catalog.extract:extract_genshi
-    python = babel.catalog.extract:extract_python
+    genshi = babel.messages.extract:extract_genshi
+    python = babel.messages.extract:extract_python
     """,
 
     cmdclass = {'build_doc': build_doc, 'test_doc': test_doc}