Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt	(revision 5988)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt	(revision 5989)
@@ -61,5 +61,5 @@
     ... FAC1,static,Faculty 1,faculty
     ... FAC2,static,Faculty 2,institute
-    ... FAC3,static,Faculty 3,school
+    ... FAC3,static,Faculty 3,school_of
     ... """)
 
@@ -426,5 +426,5 @@
     ... """code,review_state,title,title_prefix
     ... FAC1,static,Faculty 1,faculty
-    ... FAC4,static,Faculty 4,school
+    ... FAC4,static,Faculty 4,school_of
     ... """)
 
@@ -481,5 +481,5 @@
     >>> print open(finished_file).read()
     title_prefix,--IGNORE--,code,title
-    school,static,FAC4,Faculty 4
+    school_of,static,FAC4,Faculty 4
 
 The finished-file contains the dataset we could import, while the
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 5988)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 5989)
@@ -196,5 +196,5 @@
   ...<h2>Faculties</h2>
   ...<td> <a href="TF"> <span>TF</span></a></td>
-  ...<td>My renamed faculty</td>
+  ...<td>Faculty of My renamed faculty (TF)</td>
   ...
 
@@ -253,5 +253,5 @@
   ...<h2>Departments</h2>
   ...<td> <a href="TD"> <span>TD</span></a></td>
-  ...<td>TestDept</td>
+  ...<td>Department of TestDept (TD)</td>
   ...
 
@@ -294,5 +294,5 @@
   ...<h2>Departments</h2>
   ...<td> <a href="TD"> <span>TD</span></a></td>
-  ...<td>My renamed dept</td>
+  ...<td>Department of My renamed dept (TD)</td>
   ...
 
@@ -815,6 +815,6 @@
   >>> open('faculties.csv', 'wb').write(
   ... """code,title,title_prefix
-  ... FA,Arts,Faculty
-  ... FS,Sciences,Faculty
+  ... FA,Arts,faculty
+  ... FS,Sciences,faculty
   ... """)
 
@@ -850,9 +850,9 @@
   >>> open('departments.csv', 'wb').write(
   ... """code,title,title_prefix,faculty_code
-  ... LIT,Literature,Department,FA
-  ... SOC,Sociology,Department,FA
-  ... PHY,Physics,Department,FS
-  ... INF,Informatics,Department,FS
-  ... MAT,Math,Department,FS
+  ... LIT,Literature,department,FA
+  ... SOC,Sociology,department,FA
+  ... PHY,Physics,department,FS
+  ... INF,Informatics,department,FS
+  ... MAT,Math,department,FS
   ... """)
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt	(revision 5988)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt	(revision 5989)
@@ -86,5 +86,5 @@
 
   >>> file.size
-  9L
+  9
 
 Now let's disable tramline in our utility::
