Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 10091)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 10092)
@@ -296,5 +296,5 @@
             marked_filename = '__%s__%s/%s_%s%s' % (
                 APPLICANT_IMAGE_STORE_NAME,
-                parent_name, self.context.applicant_id, basename, ext)
+                parent_name, basename, self.context.applicant_id, ext)
         return marked_filename
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py	(revision 10091)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py	(revision 10092)
@@ -152,7 +152,7 @@
         appl.__parent__ = fake_container
         chooser = IFileStoreNameChooser(appl)
-        result = chooser.chooseName(attr='any.pdf')
-        self.assertEqual(
-            result, '__img-applicant__folder/%s_any.pdf' % appl.applicant_id)
+        result = chooser.chooseName(attr='anything.pdf')
+        self.assertEqual(
+            result, '__img-applicant__folder/anything_%s.pdf' % appl.applicant_id)
         return
 
