--- a/app/soc/models/survey.py	Sun Jun 28 17:44:44 2009 +0200
+++ b/app/soc/models/survey.py	Sun Jun 28 17:53:58 2009 +0200
@@ -142,14 +142,14 @@
       ' in the sidebar menu.')
 
   #: Date at which the survey becomes available for taking.
-  opening = db.DateTimeProperty(required=False)
-  opening.help_text = ugettext(
+  survey_start = db.DateTimeProperty(required=False)
+  survey_start.help_text = ugettext(
       'Indicates a date before which this survey'
       ' cannot be taken or displayed.')
 
   #: Deadline for taking survey.
-  deadline = db.DateTimeProperty(required=False)
-  deadline.help_text = ugettext(
+  survey_end = db.DateTimeProperty(required=False)
+  survey_end.help_text = ugettext(
       'Indicates a date after which this survey'
       ' cannot be taken.')