diff --git a/fotokiste/fotokiste/controllers.py b/fotokiste/fotokiste/controllers.py
index 60781c9..be4cc5b 100644
--- a/fotokiste/fotokiste/controllers.py
+++ b/fotokiste/fotokiste/controllers.py
@@ -30,9 +30,9 @@ 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 = '"Fusion-Fotokiste" <fotokiste@glasmensch.org>'
+MAIL_FROM_ADDRESS = '"Frieda-Fotokiste" <fotokiste@glasmensch.org>'
 MAIL_SUBJECT = "Ein überwachungskritisches Foto aus der Frieda!"
-MAIL_ATTACHMENT_FILENAME = "fusion" + IMAGE_SUFFIX
+MAIL_ATTACHMENT_FILENAME = "frieda" + IMAGE_SUFFIX
 SMTP_HOST = "localhost"
 SMTP_PORT = "25"
 MAIL_MAX_LENGTH = 5000