Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/student.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/student.py	(revision 7098)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/student.py	(revision 7099)
@@ -54,5 +54,4 @@
             self.student_id = u'Z654321'
         self.password = None
-        
         return
 
@@ -145,15 +144,13 @@
 
 class StudentFileNameChooser(grok.Adapter):
-    """A file id chooser for :class:`Applicant` objects.
-
-    `context` is an :class:`Applicant` instance.
-
-    The :class:`ApplicantImageNameChooser` can build/check file ids
-    for :class:`Applicant` objects suitable for use with
+    """A file id chooser for :class:`Student` objects.
+
+    `context` is an :class:`Student` instance.
+
+    The :class:`StudentImageNameChooser` can build/check file ids for
+    :class:`Student` objects suitable for use with
     :class:`ExtFileStore` instances. The delivered file_id contains
-    the file id marker for :class:`Applicant` object and the
-    registration number or access code of the context applicant. Also
-    the name of the connected applicant container will be part of the
-    generated file id.
+    the file id marker for :class:`Student` object and the student id
+    of the context student.
 
     This chooser is registered as an adapter providing
@@ -161,7 +158,7 @@
 
     File store name choosers like this one are only convenience
-    components to ease the task of creating file ids for applicant
+    components to ease the task of creating file ids for student
     objects. You are nevertheless encouraged to use them instead of
-    manually setting up filenames for applicants.
+    manually setting up filenames for students.
 
     .. seealso:: :mod:`waeup.sirp.imagestorage`
@@ -197,8 +194,7 @@
 
         """
-        first_character = self.context.student_id[0]
+        stud_id = self.context.student_id
         marked_filename = '__%s__%s/%s/%s_%s.jpg' % (
-            STUDENT_FILE_STORE_NAME, first_character,
-            self.context.student_id, attr, self.context.student_id)
+            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, attr, stud_id)
         return marked_filename
 
@@ -223,5 +219,5 @@
 
     def pathFromFileID(self, store, root, file_id):
-        """All applicants images are filed in directory ``applicants``.
+        """All student files are put in directory ``students``.
         """
         marker, filename, basename, ext = store.extractMarker(file_id)
