Index: /main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py	(revision 6864)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py	(revision 6865)
@@ -25,5 +25,5 @@
     p_category = schema.Choice(
         title = u'Payment Category',
-        default = u'school fee',
+        default = u'schoolfee',
         vocabulary = payment_categories,
         required = True,
Index: /main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py	(revision 6864)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py	(revision 6865)
@@ -1,17 +1,15 @@
 """Vocabularies and sources for payments.
 """
-from datetime import datetime
 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
 
 payment_states = SimpleWAeUPVocabulary(
-    ('unpaid','unpaid'),
+    ('not yet paid','unpaid'),
     ('paid','paid'),
     )
 
 payment_categories = SimpleWAeUPVocabulary(
-    ('schoolfee','school fee'),
-    ('application','application'),
-    ('hostel_maintenance','hostel maintenance'),
-    ('transfer','transfer'),
-    ('gown','gown'),
+    ('School Fee','schoolfee'),
+    ('Hostel Maintenance','hostel_maintenance'),
+    ('Transfer','transfer'),
+    ('Gown','gown'),
     )
