diff --git a/doc/Warpshop.mwb b/doc/Warpshop.mwb
index 6c7a73ee2400ad13b794c19cd609a39c6002e81f..30684c7ddcd2a88b4a13a34ffcb09f3c881189b6 100644
Binary files a/doc/Warpshop.mwb and b/doc/Warpshop.mwb differ
diff --git a/doc/warpshop-db.png b/doc/warpshop-db.png
index 7ae9d507532d21b6b48787e34df8d99fd1ef7447..00d9f7a28e4bdc4334d7062b006a0040b9d816b0 100644
Binary files a/doc/warpshop-db.png and b/doc/warpshop-db.png differ
diff --git a/warpshop_server/warpshop_server/benutzer/__init__.py b/warpshop_server/warpshop_server/karte/__init__.py
similarity index 100%
rename from warpshop_server/warpshop_server/benutzer/__init__.py
rename to warpshop_server/warpshop_server/karte/__init__.py
diff --git a/warpshop_server/warpshop_server/benutzer/admin.py b/warpshop_server/warpshop_server/karte/admin.py
similarity index 55%
rename from warpshop_server/warpshop_server/benutzer/admin.py
rename to warpshop_server/warpshop_server/karte/admin.py
index cb6a59db68549f0fcff92f188f3cafefea3d3d55..a463f13bf7a3472ee35e462d18f91d3d48f99f12 100644
--- a/warpshop_server/warpshop_server/benutzer/admin.py
+++ b/warpshop_server/warpshop_server/karte/admin.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from django.contrib import admin
 
-from .models import Benutzer
+from .models import Karte
 
 
-admin.site.register(Benutzer)
+admin.site.register(Karte)
diff --git a/warpshop_server/warpshop_server/benutzer/migrations/0001_initial.py b/warpshop_server/warpshop_server/karte/migrations/0001_initial.py
similarity index 81%
rename from warpshop_server/warpshop_server/benutzer/migrations/0001_initial.py
rename to warpshop_server/warpshop_server/karte/migrations/0001_initial.py
index 425f8f70c1ebc3eebd1522eb6483c42e356d5f1d..a96815391f390534f6db883f39fbb02d43b4e62c 100644
--- a/warpshop_server/warpshop_server/benutzer/migrations/0001_initial.py
+++ b/warpshop_server/warpshop_server/karte/migrations/0001_initial.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Benutzer',
+            name='Karte',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('aktiv', models.BooleanField(default=True)),
@@ -20,9 +20,9 @@ class Migration(migrations.Migration):
                 ('saldo', models.DecimalField(max_digits=8, decimal_places=2)),
             ],
             options={
-                'db_table': b'benutzer',
-                'verbose_name': b'Benutzer',
-                'verbose_name_plural': b'Benutzer',
+                'db_table': b'karte',
+                'verbose_name': b'Karte',
+                'verbose_name_plural': b'Karten',
             },
             bases=(models.Model,),
         ),
diff --git a/warpshop_server/warpshop_server/benutzer/migrations/__init__.py b/warpshop_server/warpshop_server/karte/migrations/__init__.py
similarity index 100%
rename from warpshop_server/warpshop_server/benutzer/migrations/__init__.py
rename to warpshop_server/warpshop_server/karte/migrations/__init__.py
diff --git a/warpshop_server/warpshop_server/benutzer/models.py b/warpshop_server/warpshop_server/karte/models.py
similarity index 73%
rename from warpshop_server/warpshop_server/benutzer/models.py
rename to warpshop_server/warpshop_server/karte/models.py
index 5dd54dd74619d2be3b21f90ba89197de8e5c3fd0..40af4ec12dc10de94572a1f699c6653f19e30a96 100644
--- a/warpshop_server/warpshop_server/benutzer/models.py
+++ b/warpshop_server/warpshop_server/karte/models.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 from django.db import models
 
 
-class Benutzer(models.Model):
+class Karte(models.Model):
     aktiv = models.BooleanField(default=True)
     barcode = models.CharField(max_length=200)
     name = models.CharField(max_length=200)
@@ -12,6 +12,6 @@ class Benutzer(models.Model):
         return '%s [%s]' % (self.name, self.barcode)
 
     class Meta:
-        db_table = "benutzer"
-        verbose_name = "Benutzer"
-        verbose_name_plural = "Benutzer"
+        db_table = "karte"
+        verbose_name = "Karte"
+        verbose_name_plural = "Karten"
diff --git a/warpshop_server/warpshop_server/benutzer/tests.py b/warpshop_server/warpshop_server/karte/tests.py
similarity index 100%
rename from warpshop_server/warpshop_server/benutzer/tests.py
rename to warpshop_server/warpshop_server/karte/tests.py
diff --git a/warpshop_server/warpshop_server/benutzer/urls.py b/warpshop_server/warpshop_server/karte/urls.py
similarity index 100%
rename from warpshop_server/warpshop_server/benutzer/urls.py
rename to warpshop_server/warpshop_server/karte/urls.py
diff --git a/warpshop_server/warpshop_server/benutzer/views.py b/warpshop_server/warpshop_server/karte/views.py
similarity index 68%
rename from warpshop_server/warpshop_server/benutzer/views.py
rename to warpshop_server/warpshop_server/karte/views.py
index 6bed9f35d6c21b1c760fea634acd7c7624b08ac3..f3643ee3bfd3c1510f9eb985b4cb8f04107e7291 100644
--- a/warpshop_server/warpshop_server/benutzer/views.py
+++ b/warpshop_server/warpshop_server/karte/views.py
@@ -3,4 +3,4 @@ from django.http import HttpResponse
 
 
 def index(request):
-    return HttpResponse("Benutzer index.")
+    return HttpResponse("Karte index.")
diff --git a/warpshop_server/warpshop_server/transaktion/migrations/0001_initial.py b/warpshop_server/warpshop_server/transaktion/migrations/0001_initial.py
index d4fb860ddce7fbdeb4259d1e005f3add2128dc43..4bdfbaa91b7a1e5517687993f8f78cc7a7076af4 100644
--- a/warpshop_server/warpshop_server/transaktion/migrations/0001_initial.py
+++ b/warpshop_server/warpshop_server/transaktion/migrations/0001_initial.py
@@ -7,7 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('benutzer', '0001_initial'),
+        ('karte', '0001_initial'),
         ('artikel', '0001_initial'),
     ]
 
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('benutzer', models.ForeignKey(to='benutzer.Benutzer')),
+                ('karte', models.ForeignKey(to='karte.Karte')),
             ],
             options={
                 'db_table': b'transaktion',
diff --git a/warpshop_server/warpshop_server/transaktion/models.py b/warpshop_server/warpshop_server/transaktion/models.py
index 0f59e27ef581488f4d101da54588a6cb69aecac7..715da4d754d577a0557fb031809aa7e2b3448048 100644
--- a/warpshop_server/warpshop_server/transaktion/models.py
+++ b/warpshop_server/warpshop_server/transaktion/models.py
@@ -2,15 +2,15 @@ from __future__ import absolute_import
 from django.db import models
 
 from artikel.models import Artikel
-from benutzer.models import Benutzer
+from karte.models import Karte
 
 
 class Transaktion(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True)
-    benutzer = models.ForeignKey(Benutzer)
+    karte = models.ForeignKey(Karte)
 
     def __str__(self):
-        return '%s [%s] [%s]' % (self.id, self.timestamp, self.benutzer)
+        return '%s [%s] [%s]' % (self.id, self.timestamp, self.karte)
 
     class Meta:
         db_table = "transaktion"
diff --git a/warpshop_server/warpshop_server/warpshop_server/settings/base.py b/warpshop_server/warpshop_server/warpshop_server/settings/base.py
index d24fdcc4233d1372b5f5b48bf6587e42c0c40ab0..944f074a7c718c415f0319045f0330e7811f5d18 100644
--- a/warpshop_server/warpshop_server/warpshop_server/settings/base.py
+++ b/warpshop_server/warpshop_server/warpshop_server/settings/base.py
@@ -195,7 +195,7 @@ DJANGO_APPS = (
 # Apps specific for this project go here.
 LOCAL_APPS = (
     'artikel',
-    'benutzer',
+    'karte',
     'transaktion',
 )
 
diff --git a/warpshop_server/warpshop_server/warpshop_server/urls.py b/warpshop_server/warpshop_server/warpshop_server/urls.py
index d88758cc5fcdebcdb01e0c0d08a3c7ba4974dcfd..ee114f97d8468f24116ae35d6b9a05e9bac2d5bb 100644
--- a/warpshop_server/warpshop_server/warpshop_server/urls.py
+++ b/warpshop_server/warpshop_server/warpshop_server/urls.py
@@ -21,7 +21,7 @@ urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
 
     url(r'^artikel/', include('artikel.urls', namespace='artikel')),
-    url(r'^benutzer/', include('benutzer.urls', namespace='benutzer')),
+    url(r'^karte/', include('karte.urls', namespace='karte')),
     url(r'^transaktion/', include('transaktion.urls', namespace='transaktion')),
 )