diff --git a/NEWS.rst b/NEWS.rst
index e0dcca8..6582033 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -1,23 +1,23 @@
 ==================================
-postorius - web ui for GNU Mailman
+Postorius - web ui for GNU Mailman
 ==================================
 
 Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 
-The postorius Django app provides a web user interface to
+The Postorius Django app provides a web user interface to
 access GNU Mailman. 
 
-postorius is free software: you can redistribute it and/or
+Postorius is free software: you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public License as
 published by the Free Software Foundation, version 3 of the License.
 
-postorius is distributed in the hope that it will be useful,
+Postorius is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
 General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with postorius. If not, see <http://www.gnu.org/licenses/>.
+along with Postorius. If not, see <http://www.gnu.org/licenses/>.
 
 
 1.0 alpha 1 -- "Space Farm"
diff --git a/README.rst b/README.rst
index 8cde816..d505bdd 100644
--- a/README.rst
+++ b/README.rst
@@ -1,17 +1,17 @@
 ===================================
-postorius - web ui for GNU Mailman
+Postorius - web ui for GNU Mailman
 ===================================
 
 Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 
-The postorius Django app provides a web user interface to
+The Postorius Django app provides a web user interface to
 access GNU Mailman. 
 
-postorius is free software: you can redistribute it and/or
+Postorius is free software: you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public License as
 published by the Free Software Foundation, version 3 of the License.
 
-postorius is distributed in the hope that it will be useful,
+Postorius is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
 General Public License for more details.
@@ -23,11 +23,11 @@
 Requirements
 ============
 
-postorius requires Python 2.6 or newer and mailman.client,
+Postorius requires Python 2.6 or newer and mailman.client,
 the official Python bindings for GNU Mailman, it also requires
 django-social-auth.
 The minimum Django version is 1.3.
-postorius needs a running version of GNU Mailman version 3.
+Postorius needs a running version of GNU Mailman version 3.
 
 
 Installation
@@ -36,11 +36,11 @@
 To install GNU Mailman follow the instructions in the documentation:
 http://packages.python.org/mailman/
 
-A description how to run postorius on Django's dev server, can be found in 
+A description how to run Postorius on Django's dev server, can be found in 
 the GNU Mailman wiki: 
 http://wiki.list.org/display/DEV/A+5+minute+guide+to+get+the+Mailman+web+UI+running
 
-You can also find a guide how to run postorius using the Apache web server
+You can also find a guide how to run Postorius using the Apache web server
 on the Mailman wiki:
 http://wiki.list.org/display/DEV/How+to+get+Postorius+running+on+Apache+and+mod_wsgi
 
@@ -56,5 +56,5 @@
 Icons
 =====
 
-postorius uses the WPZOOM Developer Icon Set (http://www.wpzoom.com).
+Postorius uses the WPZOOM Developer Icon Set (http://www.wpzoom.com).
 
diff --git a/dev_setup/manage.py b/dev_setup/manage.py
index 73da5fa..e1079f3 100755
--- a/dev_setup/manage.py
+++ b/dev_setup/manage.py
@@ -2,20 +2,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.management import execute_manager
 try:
diff --git a/dev_setup/settings.py b/dev_setup/settings.py
index 090bc59..93da6e9 100644
--- a/dev_setup/settings.py
+++ b/dev_setup/settings.py
@@ -1,20 +1,20 @@
 #-*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 """Import App Directory to syspath"""
 
diff --git a/dev_setup/urls.py b/dev_setup/urls.py
index 4c9370e..1c17e3b 100644
--- a/dev_setup/urls.py
+++ b/dev_setup/urls.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 import postorius
 
diff --git a/src/postorius/__init__.py b/src/postorius/__init__.py
index 32dd00a..c61a15b 100644
--- a/src/postorius/__init__.py
+++ b/src/postorius/__init__.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 __version__ = '1.0.0a1'
 
diff --git a/src/postorius/context_processors.py b/src/postorius/context_processors.py
index 1cbce86..694827d 100644
--- a/src/postorius/context_processors.py
+++ b/src/postorius/context_processors.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 
 
diff --git a/src/postorius/doc/index.rst b/src/postorius/doc/index.rst
index 8b99081..b34141c 100644
--- a/src/postorius/doc/index.rst
+++ b/src/postorius/doc/index.rst
@@ -1,9 +1,4 @@
-.. mailman_django documentation master file, created by
-   sphinx-quickstart on Wed Aug 17 15:43:10 2011.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to mailman_django's documentation!
+Welcome to Postorius' documentation!
 ==========================================
 
 Contents:
diff --git a/src/postorius/fieldset_forms.py b/src/postorius/fieldset_forms.py
index 61b1b6b..7bfa337 100644
--- a/src/postorius/fieldset_forms.py
+++ b/src/postorius/fieldset_forms.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.forms import Form
 from django.utils import safestring
diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 199f20d..b340d01 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
 from django.core.validators import validate_email
diff --git a/src/postorius/models.py b/src/postorius/models.py
index 5b30afe..f27b778 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 
diff --git a/src/postorius/tests/__init__.py b/src/postorius/tests/__init__.py
index d895cbd..c2b5ab9 100644
--- a/src/postorius/tests/__init__.py
+++ b/src/postorius/tests/__init__.py
@@ -1,19 +1,19 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT 
+# Postorius is distributed in the hope that it will be useful, but WITHOUT 
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 import tests
 __test__ = {
diff --git a/src/postorius/tests/setup.py b/src/postorius/tests/setup.py
index a37b638..f334c07 100644
--- a/src/postorius/tests/setup.py
+++ b/src/postorius/tests/setup.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import time
diff --git a/src/postorius/tests/tests.py b/src/postorius/tests/tests.py
index a0cbd58..909e84f 100644
--- a/src/postorius/tests/tests.py
+++ b/src/postorius/tests/tests.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 ==============================
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index 9076120..3d26bce 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.conf.urls.defaults import *
 from django.conf import settings
diff --git a/src/postorius/utils.py b/src/postorius/utils.py
index 6f84d13..698c6b6 100644
--- a/src/postorius/utils.py
+++ b/src/postorius/utils.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
diff --git a/src/postorius/views.py b/src/postorius/views.py
index afe890a..8df86c4 100644
--- a/src/postorius/views.py
+++ b/src/postorius/views.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
 #
-# This file is part of GNU Mailman.
+# This file is part of Postorius.
 #
-# GNU Mailman is free software: you can redistribute it and/or modify it under
+# Postorius is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option)
 # any later version.
 #
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
 # You should have received a copy of the GNU General Public License along with
-# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+# Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import re