diff --git a/AUTHORS b/AUTHORS
index aaa077fa243631d980c7b5e531c006860b119612..780c6cc5038b6d0a0609bc274ea123a4cf232e44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-Tomaculum is currently created and maintained by:
+Tomāculum is currently created and maintained by:
 
     Dominik George <nik@naturalnet.de>
     Eike Tim Jesinghaus <eike@naturalnet.de>
diff --git a/COPYING b/COPYING
index 8f881301bd356fd21a42db9d92963180e0f37ab3..078acafa66a83500c07af4d194a2e5c0ffe3285c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Tomaculum - Gastro-Bestellsystem
+Tomāculum - Gastro-Bestellsystem
 Copyright (C) 2013, Dominik George <nik@naturalnet.de>
 Copyright (C) 2013, Eike Tim Jesinghaus <eike@naturalnet.de>
 
diff --git a/README b/README
index 932b91935dbc6528e632cd98520f87d985595797..1328abbf55ab8cde032cf4b6bf91af3abf4ca379 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Tomaculum - Gastro-Bestellsystem
+Tomāculum - Gastro-Bestellsystem
 Copyright (C) 2013, Dominik George <nik@naturalnet.de>
 Copyright (C) 2013, Eike Tim Jesinghaus <eike@naturalnet.de>
 
diff --git a/setup.py b/setup.py
index 2bea9ba8190c12bd99ad65ce1814e2dc14cfdf20..1daf60953d89c26f0645e7b398020a81299be1f0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # ~*~ coding: utf-8 ~*~
 
-# setup.py - Setuptools information for Tomaculum
+# setup.py - Setuptools information for Tomāculum
 # Copyright (C) 2013, Dominik George <nik@naturalnet.de>
 # Copyright (C) 2013, Eike Tim Jesinghaus <eike@naturalnet.de>
 #
@@ -22,15 +22,15 @@ from setuptools import setup, find_packages
 
 setup(
     # Basic information
-    name             = 'Tomaculum',
+    name             = 'Tomāculum',
     version          = '0.1dev',
     license          = 'AGPLv3+',
     long_description = 'System for catering services to let their customers order food',
-    url              = 'https://evolvis.naturalnet.de/projects/tomaculum',
+    url              = 'https://evolvis.naturalnet.de/projects/tomāculum',
 
     # Author information
     author       = 'Dominik George, Eike Tim Jesinghaus',
-    author_email = 'tomaculum-discuss@lists.evolvis.naturalnet.de',
+    author_email = 'tomāculum-discuss@lists.evolvis.naturalnet.de',
 
     # Included code
     packages             = find_packages('src'),
@@ -39,7 +39,7 @@ setup(
                            },
     include_package_data = True,
     package_data         = {
-                            'tomaculum': [
+                            'tomāculum': [
                                           'static/*',
                                           'templates/*'
                                          ]
diff --git a/src/tomaculum/__init__.py b/src/tomaculum/__init__.py
index 1570ff666da0e9f3155c366d9f3744b74467b0ab..f11b3227b2e940bbfdc237e3fd818e6ed2537cf8 100644
--- a/src/tomaculum/__init__.py
+++ b/src/tomaculum/__init__.py
@@ -1,6 +1,6 @@
 # ~*~ coding: utf-8 ~*~
 
-# src/tomaculum/__init__.py - source for Tomaculum main module
+# src/tomāculum/__init__.py - source for Tomāculum main module
 # Copyright (C) 2013, Dominik George <nik@naturalnet.de>
 # Copyright (C) 2013, Eike Tim Jesinghaus <eike@naturalnet.de>
 #
diff --git a/src/tomaculum/templates/layout.html b/src/tomaculum/templates/layout.html
index 5c65baac824668d76cc010b2b110b1cc236e0870..4a594e44b7d68315327d99e29a03dc6cca33aa40 100644
--- a/src/tomaculum/templates/layout.html
+++ b/src/tomaculum/templates/layout.html
@@ -11,7 +11,7 @@
  <div class="navbar navbar-fixed-top">
   <div class="navbar-inner">
    <div class="container-fluid">
-    <a class="brand" href="#">Tomaculum Gastro-Bestellsystem</a>
+    <a class="brand" href="#">Tomāculum Gastro-Bestellsystem</a>
     <div class="nav-collapse">
      <ul class="nav">
       <li><a href="#impressum" data-toggle="modal">Impressum</a></li>
@@ -37,7 +37,7 @@
   <div class="span9">
    {% if not session["user_id"] %}
     <div class="hero-unit">
-     <h2>Willkommen beim Tomaculum Gastro-Bestellsystem!</h2>
+     <h2>Willkommen beim Tomāculum Gastro-Bestellsystem!</h2>
      <p>Bitte melden Sie sich als Caterer oder als Mitarbeiter eines Kunden an.</p>
     </div>
    {% else %}