diff --git a/fotokiosk/Entwurf/Web-Interface_A.svg b/fotokiosk/Entwurf/Web-Interface_A.svg
index ecfd9ac..54089ac 100644
--- a/fotokiosk/Entwurf/Web-Interface_A.svg
+++ b/fotokiosk/Entwurf/Web-Interface_A.svg
@@ -16,7 +16,7 @@
    inkscape:version="0.44.1"
    version="1.0"
    sodipodi:docname="Web-Interface_A.svg"
-   sodipodi:docbase="/mnt/phobos/age/svn/codekasten/fotokiste/Entwurf">
+   sodipodi:docbase="/mnt/phobos/age/svn/codekasten/fotokiosk/Entwurf">
   <defs
      id="defs4">
     <inkscape:perspective
@@ -91,7 +91,7 @@
              sodipodi:role="line"
              id="tspan2406"
              x="139.44901"
-             y="153.06456">Logo für Glasmensch/Fotokiste</tspan></text>
+             y="153.06456">Logo für Glasmensch/Fotokiosk</tspan></text>
         <path
            style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="M 370.95884,121.74075 L 370.95884,121.74075"
@@ -151,7 +151,7 @@
                id="tspan3227"
                sodipodi:role="line"
                x="250.97425"
-               y="207.33772">fotokiste@glasmensch.org</tspan><tspan
+               y="207.33772">fotokiosk@glasmensch.org</tspan><tspan
                id="tspan3229"
                sodipodi:role="line"
                x="250.97425"
@@ -193,7 +193,7 @@
       <g
          id="g3371"
          transform="translate(-1546.9999,7)"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite2.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite2.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -218,7 +218,7 @@
                sodipodi:role="line"
                id="tspan3275"
                x="139.44901"
-               y="153.06456">Logo für Glasmensch/Fotokiste</tspan></text>
+               y="153.06456">Logo für Glasmensch/Fotokiosk</tspan></text>
           <path
              style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="M 370.95884,121.74075 L 370.95884,121.74075"
@@ -278,7 +278,7 @@
                  id="tspan3297"
                  sodipodi:role="line"
                  x="250.97425"
-                 y="207.33772">fotokiste@glasmensch.org</tspan><tspan
+                 y="207.33772">fotokiosk@glasmensch.org</tspan><tspan
                  id="tspan3299"
                  sodipodi:role="line"
                  x="250.97425"
@@ -401,7 +401,7 @@
       <g
          transform="translate(-5.250016,11.000021)"
          id="g3593"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
@@ -423,7 +423,7 @@
              y="153.06456"
              x="139.44901"
              id="tspan3599"
-             sodipodi:role="line">Logo für Glasmensch/Fotokiste</tspan></text>
+             sodipodi:role="line">Logo für Glasmensch/Fotokiosk</tspan></text>
         <path
            inkscape:connection-end="#rect2402"
            inkscape:connection-start="#rect2402"
@@ -435,7 +435,7 @@
       <g
          transform="translate(87.319509,447)"
          id="g3615"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
@@ -461,7 +461,7 @@
              id="tspan3623"
              sodipodi:role="line"
              x="250.97425"
-             y="207.33772">fotokiste@glasmensch.org</tspan><tspan
+             y="207.33772">fotokiosk@glasmensch.org</tspan><tspan
              id="tspan3625"
              sodipodi:role="line"
              x="250.97425"
@@ -474,13 +474,13 @@
          id="path3627"
          d="M -1987.7229,140.74075 L -1987.7229,140.74075"
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite1.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite1.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
       <g
          transform="translate(34.000061,-2.073679)"
          id="g3766"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
@@ -507,7 +507,7 @@
       <g
          transform="translate(34.000061,-12.327179)"
          id="g3825"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -605,7 +605,7 @@
          inkscape:connector-type="polyline"
          inkscape:connection-start="#rect2402"
          inkscape:connection-end="#rect2402"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite1.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite1.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
       <text
@@ -615,7 +615,7 @@
          y="22.189388"
          id="text3925"
          transform="scale(0.7616089,1.3130099)"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite1.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite1.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90"><tspan
            sodipodi:role="line"
@@ -629,7 +629,7 @@
          y="-7.1308522"
          id="text3969"
          transform="scale(0.8404344,1.1898608)"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite2.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite2.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90"><tspan
            sodipodi:role="line"
@@ -646,7 +646,7 @@
          x="-414.0744"
          y="3.3554201"
          id="text4149"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite3.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite3.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90"><tspan
            sodipodi:role="line"
@@ -659,7 +659,7 @@
            id="tspan4153">Empfänger eingeben</tspan></text>
       <g
          id="g4226"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite3.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite3.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -684,7 +684,7 @@
                y="153.06456"
                x="139.44901"
                id="tspan3410"
-               sodipodi:role="line">Logo für Glasmensch/Fotokiste</tspan></text>
+               sodipodi:role="line">Logo für Glasmensch/Fotokiosk</tspan></text>
           <path
              inkscape:connection-end="#rect2402"
              inkscape:connection-start="#rect2402"
@@ -745,7 +745,7 @@
                id="tspan3432"
                sodipodi:role="line"
                x="250.97425"
-               y="207.33772">fotokiste@glasmensch.org</tspan><tspan
+               y="207.33772">fotokiosk@glasmensch.org</tspan><tspan
                id="tspan3434"
                sodipodi:role="line"
                x="250.97425"
@@ -978,7 +978,7 @@
          x="369.77896"
          y="-21.66836"
          id="text4360"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90"><tspan
            sodipodi:role="line"
@@ -992,7 +992,7 @@
       <g
          transform="matrix(1.145262,0,0,1,-2316.482,288.0289)"
          id="g2014"
-         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiste/Entwurf/Seite4.png"
+         inkscape:export-filename="/home/lars/subversion/codekasten/fotokiosk/Entwurf/Seite4.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
diff --git a/fotokiosk/README.txt b/fotokiosk/README.txt
index 5f82080..539dbd3 100644
--- a/fotokiosk/README.txt
+++ b/fotokiosk/README.txt
@@ -1,4 +1,4 @@
-fotokiste
+fotokiosk
 
 This is a TurboGears (http://www.turbogears.org) project. It can be
-started by running the start-fotokiste.py script.
\ No newline at end of file
+started by running the start-fotokiosk.py script.
\ No newline at end of file
diff --git a/fotokiosk/dev.cfg b/fotokiosk/dev.cfg
index de52518..61581aa 100644
--- a/fotokiosk/dev.cfg
+++ b/fotokiosk/dev.cfg
@@ -2,7 +2,7 @@
 # This is where all of your settings go for your development environment
 # Settings that are the same for both development and production
 # (such as template engine, encodings, etc.) all go in
-# fotokiste/config/app.cfg
+# fotokiosk/config/app.cfg
 
 # DATABASE
 
@@ -33,7 +33,7 @@ server.socket_port=80
 # log_debug_info_filter.on = False
 
 server.environment="development"
-autoreload.package="fotokiste"
+autoreload.package="fotokiosk"
 
 # Auto-Reload after code modification
 # autoreload.on = True
@@ -46,13 +46,13 @@ tg.strict_parameters = True
 # Logging configuration generally follows the style of the standard
 # Python logging module configuration. Note that when specifying
 # log format messages, you need to use *() for formatting variables.
-# Deployment independent log configuration is in fotokiste/config/log.cfg
+# Deployment independent log configuration is in fotokiosk/config/log.cfg
 [logging]
 
 [[loggers]]
-[[[fotokiste]]]
+[[[fotokiosk]]]
 level='DEBUG'
-qualname='fotokiste'
+qualname='fotokiosk'
 handlers=['debug_out']
 
 [[[allinfo]]]
diff --git a/fotokiosk/fotokiste.egg-info/PKG-INFO b/fotokiosk/fotokiosk.egg-info/PKG-INFO
similarity index 96%
rename from fotokiosk/fotokiste.egg-info/PKG-INFO
rename to fotokiosk/fotokiosk.egg-info/PKG-INFO
index 5403fc6..6eb7f54 100644
--- a/fotokiosk/fotokiste.egg-info/PKG-INFO
+++ b/fotokiosk/fotokiosk.egg-info/PKG-INFO
@@ -1,5 +1,5 @@
 Metadata-Version: 1.0
-Name: fotokiste
+Name: fotokiosk
 Version: 1.0
 Summary: UNKNOWN
 Home-page: UNKNOWN
diff --git a/fotokiosk/fotokiosk.egg-info/SOURCES.txt b/fotokiosk/fotokiosk.egg-info/SOURCES.txt
new file mode 100644
index 0000000..b35d1dc
--- /dev/null
+++ b/fotokiosk/fotokiosk.egg-info/SOURCES.txt
@@ -0,0 +1,22 @@
+README.txt
+setup.py
+fotokiosk/__init__.py
+fotokiosk/commands.py
+fotokiosk/controllers.py
+fotokiosk/json.py
+fotokiosk/model.py
+fotokiosk/release.py
+fotokiosk.egg-info/PKG-INFO
+fotokiosk.egg-info/SOURCES.txt
+fotokiosk.egg-info/dependency_links.txt
+fotokiosk.egg-info/entry_points.txt
+fotokiosk.egg-info/not-zip-safe
+fotokiosk.egg-info/paster_plugins.txt
+fotokiosk.egg-info/requires.txt
+fotokiosk.egg-info/sqlobject.txt
+fotokiosk.egg-info/top_level.txt
+fotokiosk/config/__init__.py
+fotokiosk/templates/__init__.py
+fotokiosk/tests/__init__.py
+fotokiosk/tests/test_controllers.py
+fotokiosk/tests/test_model.py
\ No newline at end of file
diff --git a/fotokiosk/fotokiste.egg-info/dependency_links.txt b/fotokiosk/fotokiosk.egg-info/dependency_links.txt
similarity index 100%
rename from fotokiosk/fotokiste.egg-info/dependency_links.txt
rename to fotokiosk/fotokiosk.egg-info/dependency_links.txt
diff --git a/fotokiosk/fotokiosk.egg-info/entry_points.txt b/fotokiosk/fotokiosk.egg-info/entry_points.txt
new file mode 100644
index 0000000..24fef5d
--- /dev/null
+++ b/fotokiosk/fotokiosk.egg-info/entry_points.txt
@@ -0,0 +1,3 @@
+[console_scripts]
+start-fotokiosk = fotokiosk.commands:start
+
diff --git a/fotokiosk/fotokiste.egg-info/not-zip-safe b/fotokiosk/fotokiosk.egg-info/not-zip-safe
similarity index 100%
rename from fotokiosk/fotokiste.egg-info/not-zip-safe
rename to fotokiosk/fotokiosk.egg-info/not-zip-safe
diff --git a/fotokiosk/fotokiste.egg-info/paster_plugins.txt b/fotokiosk/fotokiosk.egg-info/paster_plugins.txt
similarity index 100%
rename from fotokiosk/fotokiste.egg-info/paster_plugins.txt
rename to fotokiosk/fotokiosk.egg-info/paster_plugins.txt
diff --git a/fotokiosk/fotokiste.egg-info/requires.txt b/fotokiosk/fotokiosk.egg-info/requires.txt
similarity index 100%
rename from fotokiosk/fotokiste.egg-info/requires.txt
rename to fotokiosk/fotokiosk.egg-info/requires.txt
diff --git a/fotokiosk/fotokiosk.egg-info/sqlobject.txt b/fotokiosk/fotokiosk.egg-info/sqlobject.txt
new file mode 100644
index 0000000..99af0d3
--- /dev/null
+++ b/fotokiosk/fotokiosk.egg-info/sqlobject.txt
@@ -0,0 +1,2 @@
+db_module=fotokiosk.model
+history_dir=$base/fotokiosk/sqlobject-history
diff --git a/fotokiosk/fotokiosk.egg-info/top_level.txt b/fotokiosk/fotokiosk.egg-info/top_level.txt
new file mode 100644
index 0000000..cf9bde2
--- /dev/null
+++ b/fotokiosk/fotokiosk.egg-info/top_level.txt
@@ -0,0 +1 @@
+fotokiosk
diff --git a/fotokiosk/fotokiste/__init__.py b/fotokiosk/fotokiosk/__init__.py
similarity index 100%
rename from fotokiosk/fotokiste/__init__.py
rename to fotokiosk/fotokiosk/__init__.py
diff --git a/fotokiosk/fotokiste/commands.py b/fotokiosk/fotokiosk/commands.py
similarity index 91%
rename from fotokiosk/fotokiste/commands.py
rename to fotokiosk/fotokiosk/commands.py
index 79a7ced..294c857 100644
--- a/fotokiosk/fotokiste/commands.py
+++ b/fotokiosk/fotokiosk/commands.py
@@ -40,14 +40,14 @@ def start():
     else:
         try:
             configfile = pkg_resources.resource_filename(
-              pkg_resources.Requirement.parse("fotokiste"),
+              pkg_resources.Requirement.parse("fotokiosk"),
                 "config/default.cfg")
         except pkg_resources.DistributionNotFound:
             raise ConfigurationError("Could not find default configuration.")
 
     turbogears.update_config(configfile=configfile,
-        modulename="fotokiste.config")
+        modulename="fotokiosk.config")
 
-    from fotokiste.controllers import Root
+    from fotokiosk.controllers import Root
 
     turbogears.start_server(Root())
diff --git a/fotokiosk/fotokiste/config/__init__.py b/fotokiosk/fotokiosk/config/__init__.py
similarity index 100%
rename from fotokiosk/fotokiste/config/__init__.py
rename to fotokiosk/fotokiosk/config/__init__.py
diff --git a/fotokiosk/fotokiste/config/app.cfg b/fotokiosk/fotokiosk/config/app.cfg
similarity index 100%
rename from fotokiosk/fotokiste/config/app.cfg
rename to fotokiosk/fotokiosk/config/app.cfg
diff --git a/fotokiosk/fotokiste/config/log.cfg b/fotokiosk/fotokiosk/config/log.cfg
similarity index 100%
rename from fotokiosk/fotokiste/config/log.cfg
rename to fotokiosk/fotokiosk/config/log.cfg
diff --git a/fotokiosk/fotokiste/controllers.py b/fotokiosk/fotokiosk/controllers.py
similarity index 93%
rename from fotokiosk/fotokiste/controllers.py
rename to fotokiosk/fotokiosk/controllers.py
index be4cc5b..2ce683c 100644
--- a/fotokiosk/fotokiste/controllers.py
+++ b/fotokiosk/fotokiosk/controllers.py
@@ -2,9 +2,9 @@
 
 import turbogears as tg
 from turbogears import controllers, expose, flash, redirect
-# from fotokiste import model
+# from fotokiosk import model
 # import logging
-# log = logging.getLogger("fotokiste.controllers")
+# log = logging.getLogger("fotokiosk.controllers")
 
 
 class SamplePicture(object):
@@ -19,18 +19,18 @@ import re
 import datetime
 import random
 
-IMAGE_GALLERY_PATH = os.path.join(os.getcwd(), 'fotokiste', 'static', 'gallery')
+IMAGE_GALLERY_PATH = os.path.join(os.getcwd(), 'fotokiosk', 'static', 'gallery')
 IMAGE_SUFFIX = ".jpg"
-IMAGE_STORE = os.path.join(tempfile.gettempdir(), "fotokiste" + IMAGE_SUFFIX)
+IMAGE_STORE = os.path.join(tempfile.gettempdir(), "fotokiosk" + IMAGE_SUFFIX)
 GALLERY_NUM = 12
-VIDEO_URL = "http://fotokiste:8081/?action=stream"
-SNAPSHOT_URL = "http://fotokiste:8081/?action=snapshot"
+VIDEO_URL = "http://fotokiosk:8081/?action=stream"
+SNAPSHOT_URL = "http://fotokiosk:8081/?action=snapshot"
 ALLOWED_MAILADDRESS_CHARACTERS = "\w._%@-"
 ALLOWED_MAILTEXT_CHARACTERS = "\w@_\-\.\s\n\#\(\)\[\]\{\}\|\>\<\,\+/\'\"\?\!\:=%\$^&\*"
 MAIL_ADDRESS_REGEX = r"^[a-zA-Z0-9._%-]+@[a-zA-Z0-9._%-]+\.[a-zA-Z]{2,6}$"
 # TODO: this path is relative - to be fixed!
 MAIL_SIGNATURE_FILE = os.path.join(os.getcwd(), "mail_signature.txt")
-MAIL_FROM_ADDRESS = '"Frieda-Fotokiste" <fotokiste@glasmensch.org>'
+MAIL_FROM_ADDRESS = '"Frieda-Fotokiosk" <fotokiosk@glasmensch.org>'
 MAIL_SUBJECT = "Ein überwachungskritisches Foto aus der Frieda!"
 MAIL_ATTACHMENT_FILENAME = "frieda" + IMAGE_SUFFIX
 SMTP_HOST = "localhost"
@@ -152,7 +152,7 @@ def send_mail(address, text):
 
 class Root(controllers.RootController):
 
-    @expose(template="fotokiste.templates.start")
+    @expose(template="fotokiosk.templates.start")
     def index(self, **kargs):
 
         # TODO: this should generate a selection of random pictures
@@ -171,13 +171,13 @@ class Root(controllers.RootController):
         return merged_dicts({ "gallery": gallery }, DEFAULT_DICT)
 
 
-    @expose(template="fotokiste.templates.ausloeser")
+    @expose(template="fotokiosk.templates.ausloeser")
     def ausloeser(self, **kargs):
         flash("Das Bild wird in 5 Sekunden aufgenommen!")
         return merged_dicts({}, DEFAULT_DICT)
 
 
-    @expose(template="fotokiste.templates.mailtext")
+    @expose(template="fotokiosk.templates.mailtext")
     def mailtext(self, mailaddress="", mailtext="", already_captured="no", already_stored="no", **kargs):
         # store the picture if necessary
         if already_captured != "yes":
@@ -204,7 +204,7 @@ class Root(controllers.RootController):
                 }, DEFAULT_DICT)
 
 
-    @expose(template="fotokiste.templates.senden")
+    @expose(template="fotokiosk.templates.senden")
     def senden(self, mailaddress="", mailtext="", already_stored="no", senden=None):
         # filter input
         mailaddress = filter_mailaddress(mailaddress)
diff --git a/fotokiosk/fotokiste/json.py b/fotokiosk/fotokiosk/json.py
similarity index 100%
rename from fotokiosk/fotokiste/json.py
rename to fotokiosk/fotokiosk/json.py
diff --git a/fotokiosk/fotokiste/model.py b/fotokiosk/fotokiosk/model.py
similarity index 93%
rename from fotokiosk/fotokiste/model.py
rename to fotokiosk/fotokiosk/model.py
index 042f3ae..fb4f8ff 100644
--- a/fotokiosk/fotokiste/model.py
+++ b/fotokiosk/fotokiosk/model.py
@@ -8,7 +8,7 @@ from sqlobject import SQLObject, SQLObjectNotFound, RelatedJoin
 # (see http://www.sqlobject.org/SQLObject.html#column-types for more)
 from sqlobject import StringCol, UnicodeCol, IntCol, DateTimeCol
 
-__connection__ = hub = PackageHub('fotokiste')
+__connection__ = hub = PackageHub('fotokiosk')
 
 
 
diff --git a/fotokiosk/fotokiste/release.py b/fotokiosk/fotokiosk/release.py
similarity index 91%
rename from fotokiosk/fotokiste/release.py
rename to fotokiosk/fotokiosk/release.py
index 66b7ec9..e260027 100644
--- a/fotokiosk/fotokiste/release.py
+++ b/fotokiosk/fotokiosk/release.py
@@ -1,4 +1,4 @@
-# Release information about fotokiste
+# Release information about fotokiosk
 
 version = "1.0"
 
diff --git a/fotokiosk/fotokiste/static/css/1024optimized.css b/fotokiosk/fotokiosk/static/css/1024optimized.css
similarity index 100%
rename from fotokiosk/fotokiste/static/css/1024optimized.css
rename to fotokiosk/fotokiosk/static/css/1024optimized.css
diff --git a/fotokiosk/fotokiste/static/css/style.css b/fotokiosk/fotokiosk/static/css/style.css
similarity index 100%
rename from fotokiosk/fotokiste/static/css/style.css
rename to fotokiosk/fotokiosk/static/css/style.css
diff --git a/fotokiosk/fotokiste/static/images/favicon.ico b/fotokiosk/fotokiosk/static/images/favicon.ico
similarity index 100%
rename from fotokiosk/fotokiste/static/images/favicon.ico
rename to fotokiosk/fotokiosk/static/images/favicon.ico
diff --git a/fotokiosk/fotokiste/static/images/fotokiste-default.jpg b/fotokiosk/fotokiosk/static/images/fotokiste-default.jpg
similarity index 100%
rename from fotokiosk/fotokiste/static/images/fotokiste-default.jpg
rename to fotokiosk/fotokiosk/static/images/fotokiste-default.jpg
diff --git a/fotokiosk/fotokiste/static/images/header.png b/fotokiosk/fotokiosk/static/images/header.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/header.png
rename to fotokiosk/fotokiosk/static/images/header.png
diff --git a/fotokiosk/fotokiste/static/images/header_inner.png b/fotokiosk/fotokiosk/static/images/header_inner.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/header_inner.png
rename to fotokiosk/fotokiosk/static/images/header_inner.png
diff --git a/fotokiosk/fotokiste/static/images/info.png b/fotokiosk/fotokiosk/static/images/info.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/info.png
rename to fotokiosk/fotokiosk/static/images/info.png
diff --git a/fotokiosk/fotokiste/static/images/logo.png b/fotokiosk/fotokiosk/static/images/logo.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/logo.png
rename to fotokiosk/fotokiosk/static/images/logo.png
diff --git a/fotokiosk/fotokiste/static/images/ok.png b/fotokiosk/fotokiosk/static/images/ok.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/ok.png
rename to fotokiosk/fotokiosk/static/images/ok.png
diff --git a/fotokiosk/fotokiste/static/images/platzhalter.jpg b/fotokiosk/fotokiosk/static/images/platzhalter.jpg
similarity index 100%
rename from fotokiosk/fotokiste/static/images/platzhalter.jpg
rename to fotokiosk/fotokiosk/static/images/platzhalter.jpg
diff --git a/fotokiosk/fotokiste/static/images/tg_under_the_hood.png b/fotokiosk/fotokiosk/static/images/tg_under_the_hood.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/tg_under_the_hood.png
rename to fotokiosk/fotokiosk/static/images/tg_under_the_hood.png
diff --git a/fotokiosk/fotokiste/static/images/under_the_hood_blue.png b/fotokiosk/fotokiosk/static/images/under_the_hood_blue.png
similarity index 100%
rename from fotokiosk/fotokiste/static/images/under_the_hood_blue.png
rename to fotokiosk/fotokiosk/static/images/under_the_hood_blue.png
diff --git a/fotokiosk/fotokiste/static/javascript/mjp-streamer.js b/fotokiosk/fotokiosk/static/javascript/mjp-streamer.js
similarity index 95%
rename from fotokiosk/fotokiste/static/javascript/mjp-streamer.js
rename to fotokiosk/fotokiosk/static/javascript/mjp-streamer.js
index beaa212..99fee9d 100644
--- a/fotokiosk/fotokiste/static/javascript/mjp-streamer.js
+++ b/fotokiosk/fotokiosk/static/javascript/mjp-streamer.js
@@ -15,7 +15,7 @@ function createImageLayer() {
   img.style.height = "320px";
   img.onload = imageOnload;
   img.onclick = imageOnclick;
-  img.src = "http://fotokiste:8081/?action=snapshot&n=" + (++imageNr);
+  img.src = "http://fotokiosk:8081/?action=snapshot&n=" + (++imageNr);
   var webcam = document.getElementById("live_pic");
   webcam.insertBefore(img, webcam.firstChild);
 }
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/simple/button_set.gif b/fotokiosk/fotokiosk/static/virtual_keyboard/css/simple/button_set.gif
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/simple/button_set.gif
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/simple/button_set.gif
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/simple/keyboard.css b/fotokiosk/fotokiosk/static/virtual_keyboard/css/simple/keyboard.css
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/simple/keyboard.css
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/simple/keyboard.css
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/small/button_set.gif b/fotokiosk/fotokiosk/static/virtual_keyboard/css/small/button_set.gif
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/small/button_set.gif
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/small/button_set.gif
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/small/keyboard.css b/fotokiosk/fotokiosk/static/virtual_keyboard/css/small/keyboard.css
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/small/keyboard.css
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/small/keyboard.css
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/soberTouch/button_set.gif b/fotokiosk/fotokiosk/static/virtual_keyboard/css/soberTouch/button_set.gif
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/soberTouch/button_set.gif
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/soberTouch/button_set.gif
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/soberTouch/keyboard.css b/fotokiosk/fotokiosk/static/virtual_keyboard/css/soberTouch/keyboard.css
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/soberTouch/keyboard.css
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/soberTouch/keyboard.css
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/winxp/button_set.gif b/fotokiosk/fotokiosk/static/virtual_keyboard/css/winxp/button_set.gif
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/winxp/button_set.gif
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/winxp/button_set.gif
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/css/winxp/keyboard.css b/fotokiosk/fotokiosk/static/virtual_keyboard/css/winxp/keyboard.css
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/css/winxp/keyboard.css
rename to fotokiosk/fotokiosk/static/virtual_keyboard/css/winxp/keyboard.css
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/documentselection.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/documentselection.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/documentselection.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/documentselection.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/dom.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/dom.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/dom.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/dom.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/eventmanager.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/eventmanager.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/eventmanager.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/eventmanager.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/array.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/array.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/array.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/array.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/object.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/object.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/object.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/object.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/regexp.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/regexp.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/regexp.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/regexp.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/string.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/string.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/ext/string.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/ext/string.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/helpers.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/helpers.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/helpers.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/helpers.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/extensions/scriptqueue.js b/fotokiosk/fotokiosk/static/virtual_keyboard/extensions/scriptqueue.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/extensions/scriptqueue.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/extensions/scriptqueue.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/layouts/layouts.js b/fotokiosk/fotokiosk/static/virtual_keyboard/layouts/layouts.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/layouts/layouts.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/layouts/layouts.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/virtualkeyboard.js b/fotokiosk/fotokiosk/static/virtual_keyboard/virtualkeyboard.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/virtualkeyboard.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/virtualkeyboard.js
diff --git a/fotokiosk/fotokiste/static/virtual_keyboard/vk_loader.js b/fotokiosk/fotokiosk/static/virtual_keyboard/vk_loader.js
similarity index 100%
rename from fotokiosk/fotokiste/static/virtual_keyboard/vk_loader.js
rename to fotokiosk/fotokiosk/static/virtual_keyboard/vk_loader.js
diff --git a/fotokiosk/fotokiste/templates/__init__.py b/fotokiosk/fotokiosk/templates/__init__.py
similarity index 100%
rename from fotokiosk/fotokiste/templates/__init__.py
rename to fotokiosk/fotokiosk/templates/__init__.py
diff --git a/fotokiosk/fotokiste/templates/ausloeser.kid b/fotokiosk/fotokiosk/templates/ausloeser.kid
similarity index 87%
rename from fotokiosk/fotokiste/templates/ausloeser.kid
rename to fotokiosk/fotokiosk/templates/ausloeser.kid
index b0ed806..de4bb3d 100644
--- a/fotokiosk/fotokiste/templates/ausloeser.kid
+++ b/fotokiosk/fotokiosk/templates/ausloeser.kid
@@ -9,7 +9,7 @@
 <body>
 
    
-    <div id="live_pic"><img src="../static/images/fotokiste-default.png"
+    <div id="live_pic"><img src="../static/images/fotokiosk-default.png"
         py:attrs="src=video_url"/></div>
 
 </body>
diff --git a/fotokiosk/fotokiste/templates/login.kid b/fotokiosk/fotokiosk/templates/login.kid
similarity index 100%
rename from fotokiosk/fotokiste/templates/login.kid
rename to fotokiosk/fotokiosk/templates/login.kid
diff --git a/fotokiosk/fotokiste/templates/mailtext.kid b/fotokiosk/fotokiosk/templates/mailtext.kid
similarity index 97%
rename from fotokiosk/fotokiste/templates/mailtext.kid
rename to fotokiosk/fotokiosk/templates/mailtext.kid
index 26e4b08..8c1d787 100644
--- a/fotokiosk/fotokiste/templates/mailtext.kid
+++ b/fotokiosk/fotokiosk/templates/mailtext.kid
@@ -17,7 +17,7 @@
             <input class="button" type="submit" name="senden" value="Zur&uuml;ck" />
         </form>
     </td><td>
-            <div id="mail_pic"><img src="../static/images/fotokiste-default.png"
+            <div id="mail_pic"><img src="../static/images/fotokiosk-default.png"
                 py:attrs="src=tg.url('/get_current_shot')"/></div>
     </td>
     <td>
diff --git a/fotokiosk/fotokiste/templates/master.kid b/fotokiosk/fotokiosk/templates/master.kid
similarity index 93%
rename from fotokiosk/fotokiste/templates/master.kid
rename to fotokiosk/fotokiosk/templates/master.kid
index 57ca956..be13a81 100644
--- a/fotokiosk/fotokiste/templates/master.kid
+++ b/fotokiosk/fotokiosk/templates/master.kid
@@ -5,7 +5,7 @@
 
 <head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
     <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
-    <title py:replace="''">panoptische Fotokiste</title>
+    <title py:replace="''">panoptische Fotokiosk</title>
     <meta py:replace="item[:]" name="description" content="master template"/>
     <style type="text/css" media="screen">
         #pageLogin
@@ -34,7 +34,7 @@
     <div id="header">
         <img src="../static/images/header.png')"
             py:attrs="src=tg.url('/static/images/header.png')"
-            alt="panoptische Fotokiste" />
+            alt="panoptische Fotokiosk" />
     </div>
 
 
diff --git a/fotokiosk/fotokiste/templates/senden.kid b/fotokiosk/fotokiosk/templates/senden.kid
similarity index 89%
rename from fotokiosk/fotokiste/templates/senden.kid
rename to fotokiosk/fotokiosk/templates/senden.kid
index 164f6dd..082aa94 100644
--- a/fotokiosk/fotokiste/templates/senden.kid
+++ b/fotokiosk/fotokiosk/templates/senden.kid
@@ -10,7 +10,7 @@
    
     <table>
     <tr><td>
-    <div id="mail_pic"><img src="../static/images/fotokiste-default.png"
+    <div id="mail_pic"><img src="../static/images/fotokiosk-default.png"
         py:attrs="src=tg.url('/get_current_shot')"/></div>
    </td><td>
     <div id="mail_info">
@@ -30,7 +30,7 @@
     <div id="footer">
         <p>
             <img src="${tg.url('/static/images/logo.png')}" alt="Sense.Lab e.V." /> <br/>
-            Die Fotokiste ist ein sense.lab-Projekt und ein Modul der Glasmensch-Ausstellung.<br/>
+            Die Fotokiosk ist ein sense.lab-Projekt und ein Modul der Glasmensch-Ausstellung.<br/>
             Alle Inhalte k&ouml;nnen im Sinne einer Creative Commons Lizenz (BY-SA) beliebig weiter verwendet werden.
         </p>
     </div>
diff --git a/fotokiosk/fotokiste/templates/start.kid b/fotokiosk/fotokiosk/templates/start.kid
similarity index 93%
rename from fotokiosk/fotokiste/templates/start.kid
rename to fotokiosk/fotokiosk/templates/start.kid
index e779abc..1c94851 100644
--- a/fotokiosk/fotokiste/templates/start.kid
+++ b/fotokiosk/fotokiosk/templates/start.kid
@@ -3,7 +3,7 @@
     py:extends="'master.kid'">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>Willkommen in der Fotokiste!</title>
+<title>Willkommen in der Fotokiosk!</title>
 <script type="text/javascript" src="../static/javascript/mjp-streamer.js"
 	py:attrs="src=tg.url('/static/javascript/mjp-streamer.js')" />
 <title>Bild versenden</title>
@@ -14,10 +14,10 @@
       <tr>
           <td>
               <div id="live_pic"><noscript><img width="400" height="320"
-                  src="../static/images/fotokiste-default.jpg"
+                  src="../static/images/fotokiosk-default.jpg"
                   py:attrs="src=video_url"/></noscript></div>
               <div id="default_pic"><img width="400" height="320"
-                  src="../static/images/fotokiste-default.jpg" /></div>
+                  src="../static/images/fotokiosk-default.jpg" /></div>
           </td>
           <td valign="center">
               <form action="${tg.url('/mailtext')}" method="post">
@@ -77,7 +77,7 @@
   </div>
     <div id="footer">
         <p>
-            Die Fotokiste ist ein sense.lab-Projekt und ein Modul der Glasmensch-Ausstellung.<br/>
+            Die Fotokiosk ist ein sense.lab-Projekt und ein Modul der Glasmensch-Ausstellung.<br/>
             Alle Inhalte k&ouml;nnen im Sinne einer Creative Commons Lizenz (BY-SA) beliebig weiter verwendet werden.
         </p>
     </div>
diff --git a/fotokiosk/fotokiste/templates/welcome.kid b/fotokiosk/fotokiosk/templates/welcome.kid
similarity index 100%
rename from fotokiosk/fotokiste/templates/welcome.kid
rename to fotokiosk/fotokiosk/templates/welcome.kid
diff --git a/fotokiosk/fotokiste/tests/__init__.py b/fotokiosk/fotokiosk/tests/__init__.py
similarity index 100%
rename from fotokiosk/fotokiste/tests/__init__.py
rename to fotokiosk/fotokiosk/tests/__init__.py
diff --git a/fotokiosk/fotokiste/tests/test_controllers.py b/fotokiosk/fotokiosk/tests/test_controllers.py
similarity index 96%
rename from fotokiosk/fotokiste/tests/test_controllers.py
rename to fotokiosk/fotokiosk/tests/test_controllers.py
index 2889fb5..875066c 100644
--- a/fotokiosk/fotokiste/tests/test_controllers.py
+++ b/fotokiosk/fotokiosk/tests/test_controllers.py
@@ -1,7 +1,7 @@
 import unittest
 import turbogears
 from turbogears import testutil
-from fotokiste.controllers import Root
+from fotokiosk.controllers import Root
 import cherrypy
 
 cherrypy.root = Root()
diff --git a/fotokiosk/fotokiste/tests/test_model.py b/fotokiosk/fotokiosk/tests/test_model.py
similarity index 94%
rename from fotokiosk/fotokiste/tests/test_model.py
rename to fotokiosk/fotokiosk/tests/test_model.py
index 553cc69..40afcb2 100644
--- a/fotokiosk/fotokiste/tests/test_model.py
+++ b/fotokiosk/fotokiosk/tests/test_model.py
@@ -5,7 +5,7 @@
 # which is very fast.
 
 from turbogears import testutil, database
-# from fotokiste.model import YourDataClass, User
+# from fotokiosk.model import YourDataClass, User
 
 # database.set_db_uri("sqlite:///:memory:")
 
diff --git a/fotokiosk/fotokiste.egg-info/SOURCES.txt b/fotokiosk/fotokiste.egg-info/SOURCES.txt
deleted file mode 100644
index c2f514c..0000000
--- a/fotokiosk/fotokiste.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-README.txt
-setup.py
-fotokiste/__init__.py
-fotokiste/commands.py
-fotokiste/controllers.py
-fotokiste/json.py
-fotokiste/model.py
-fotokiste/release.py
-fotokiste.egg-info/PKG-INFO
-fotokiste.egg-info/SOURCES.txt
-fotokiste.egg-info/dependency_links.txt
-fotokiste.egg-info/entry_points.txt
-fotokiste.egg-info/not-zip-safe
-fotokiste.egg-info/paster_plugins.txt
-fotokiste.egg-info/requires.txt
-fotokiste.egg-info/sqlobject.txt
-fotokiste.egg-info/top_level.txt
-fotokiste/config/__init__.py
-fotokiste/templates/__init__.py
-fotokiste/tests/__init__.py
-fotokiste/tests/test_controllers.py
-fotokiste/tests/test_model.py
\ No newline at end of file
diff --git a/fotokiosk/fotokiste.egg-info/entry_points.txt b/fotokiosk/fotokiste.egg-info/entry_points.txt
deleted file mode 100644
index 8a8c6f4..0000000
--- a/fotokiosk/fotokiste.egg-info/entry_points.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[console_scripts]
-start-fotokiste = fotokiste.commands:start
-
diff --git a/fotokiosk/fotokiste.egg-info/sqlobject.txt b/fotokiosk/fotokiste.egg-info/sqlobject.txt
deleted file mode 100644
index f033968..0000000
--- a/fotokiosk/fotokiste.egg-info/sqlobject.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-db_module=fotokiste.model
-history_dir=$base/fotokiste/sqlobject-history
diff --git a/fotokiosk/fotokiste.egg-info/top_level.txt b/fotokiosk/fotokiste.egg-info/top_level.txt
deleted file mode 100644
index 9b2329a..0000000
--- a/fotokiosk/fotokiste.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-fotokiste
diff --git a/fotokiosk/mail_signature.txt b/fotokiosk/mail_signature.txt
index bb24903..1e08e15 100644
--- a/fotokiosk/mail_signature.txt
+++ b/fotokiosk/mail_signature.txt
@@ -4,7 +4,7 @@
 
 Hallo,
 
-diese Mail wurde Ihnen mit der panoptischen Fotokiste vom Frieda Hoffest 2008 in Rostock geschickt. 
+diese Mail wurde Ihnen mit der panoptischen Fotokiosk vom Frieda Hoffest 2008 in Rostock geschickt. 
 Die Personen auf dem Foto möchten damit ein Zeichen gegen zunehmend verschärfte Überwachungsbestrebungen setzen und sie mit den folgenden Punkten auf Ihre Handlungsmöglichkeiten aufmerksam machen.
 
 
diff --git a/fotokiosk/sample-prod.cfg b/fotokiosk/sample-prod.cfg
index 49e1937..165d2a8 100644
--- a/fotokiosk/sample-prod.cfg
+++ b/fotokiosk/sample-prod.cfg
@@ -4,7 +4,7 @@
 # as a command-line option to your start script.
 # Settings that are the same for both development and production
 # (such as template engine, encodings, etc.) all go in 
-# fotokiste/config/app.cfg
+# fotokiosk/config/app.cfg
 
 # DATABASE
 
@@ -59,7 +59,7 @@ server.environment="production"
 # Logging configuration generally follows the style of the standard
 # Python logging module configuration. Note that when specifying
 # log format messages, you need to use *() for formatting variables.
-# Deployment independent log configuration is in fotokiste/config/log.cfg
+# Deployment independent log configuration is in fotokiosk/config/log.cfg
 [logging]
 
 [[handlers]]
@@ -72,9 +72,9 @@ level='INFO'
 formatter='message_only'
 
 [[loggers]]
-[[[fotokiste]]]
+[[[fotokiosk]]]
 level='ERROR'
-qualname='fotokiste'
+qualname='fotokiosk'
 handlers=['error_out']
 
 [[[access]]]
diff --git a/fotokiosk/setup.py b/fotokiosk/setup.py
index 71bd154..94a9b94 100644
--- a/fotokiosk/setup.py
+++ b/fotokiosk/setup.py
@@ -4,18 +4,18 @@ from setuptools import setup, find_packages
 from turbogears.finddata import find_package_data
 
 import os
-execfile(os.path.join("fotokiste", "release.py"))
+execfile(os.path.join("fotokiosk", "release.py"))
 
 packages=find_packages()
-package_data = find_package_data(where='fotokiste',
-    package='fotokiste')
+package_data = find_package_data(where='fotokiosk',
+    package='fotokiosk')
 if os.path.isdir('locales'):
     packages.append('locales')
     package_data.update(find_package_data(where='locales',
         exclude=('*.po',), only_in_packages=False))
 
 setup(
-    name="fotokiste",
+    name="fotokiosk",
     version=version,
     # uncomment the following lines if you fill them out in release.py
     #description=description,
@@ -68,7 +68,7 @@ setup(
     test_suite='nose.collector',
     entry_points = {
         'console_scripts': [
-            'start-fotokiste = fotokiste.commands:start',
+            'start-fotokiosk = fotokiosk.commands:start',
         ],
     },
     # Uncomment next line and create a default.cfg file in your project dir
diff --git a/fotokiosk/start-fotokiste.py b/fotokiosk/start-fotokiosk.py
similarity index 77%
rename from fotokiosk/start-fotokiste.py
rename to fotokiosk/start-fotokiosk.py
index 06f3e71..1f36cda 100755
--- a/fotokiosk/start-fotokiste.py
+++ b/fotokiosk/start-fotokiosk.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.4
 # -*- coding: utf-8 -*-
-"""Start script for the fotokiste TurboGears project.
+"""Start script for the fotokiosk TurboGears project.
 
 This script is only needed during development for running from the project
 directory. When the project is installed, easy_install will create a
@@ -8,7 +8,7 @@ proper start script.
 """
 
 import sys
-from fotokiste.commands import start, ConfigurationError
+from fotokiosk.commands import start, ConfigurationError
 
 if __name__ == "__main__":
     try:
diff --git a/fotokiosk/system-scripts/fotokiste b/fotokiosk/system-scripts/fotokiosk
similarity index 63%
rename from fotokiosk/system-scripts/fotokiste
rename to fotokiosk/system-scripts/fotokiosk
index 0c35b01..78137df 100755
--- a/fotokiosk/system-scripts/fotokiste
+++ b/fotokiosk/system-scripts/fotokiosk
@@ -1,19 +1,19 @@
 #!/bin/sh
 set -u
-FOTOKISTE_DIR="/usr/local/src/fotokiste"
-FOTOKISTE_EXEC="start-fotokiste.py"
-PID_FILE="/var/run/fotokiste.pid"
-LOG_FILE="/var/log/fotokiste.log"
-MJPG_STREAMER=/usr/local/src/mjpg-streamer/start-fotokiste.sh
+FOTOKIOSK_DIR="/usr/local/src/fotokiosk"
+FOTOKIOSK_EXEC="start-fotokiosk.py"
+PID_FILE="/var/run/fotokiosk.pid"
+LOG_FILE="/var/log/fotokiosk.log"
+MJPG_STREAMER=/usr/local/src/mjpg-streamer/start-fotokiosk.sh
 LOG_FILE_MJPG=/var/log/mjpg-streamer.log
 PID_FILE_MJPG=/var/run/mjpg-streamer.pid
 
 case "$1" in
   start)
-	echo -n "Starting Fotokiste ... "
+	echo -n "Starting Fotokiosk ... "
 	"$MJPG_STREAMER" &>"$LOG_FILE_MJPG" </dev/null &
 	echo "$!" >"$PID_FILE_MJPG"
-	cd "$FOTOKISTE_DIR"; python "$FOTOKISTE_EXEC" </dev/null &>"$LOG_FILE" &
+	cd "$FOTOKIOSK_DIR"; python "$FOTOKIOSK_EXEC" </dev/null &>"$LOG_FILE" &
 	echo "$!" >"$PID_FILE"
 	echo done
 	X &
diff --git a/fotokiosk/test.cfg b/fotokiosk/test.cfg
index 4c36b93..6697e79 100644
--- a/fotokiosk/test.cfg
+++ b/fotokiosk/test.cfg
@@ -21,9 +21,9 @@ args='(sys.stdout,)'
 formatter='full_content'
 
 [[loggers]]
-[[[fotokiste]]]
+[[[fotokiosk]]]
 level='DEBUG'
-qualname='fotokiste'
+qualname='fotokiosk'
 handlers=['test_out']
 
 [[[turbogears]]]