--- a/app/gsoc/models/timeline.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/gsoc/models/timeline.py	Wed Jan 07 16:49:16 2009 +0000
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module contains the Timeline Model."""
+"""This module contains the Timeline Model.
+"""
 
 __authors__ = [
   '"Sverre Rabbelier" <sverre@rabbelier.nl>',
@@ -27,12 +28,13 @@
 
 import soc.models.timeline
 
+
 class Timeline(soc.models.timeline.Timeline):
   """The GSoC Timeline Model.
   """
 
-  accepted_organisation_announced_deadline = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Accepted Organisations Announced Deadline'))
+  accepted_organization_announced_deadline = db.DateTimeProperty(
+      verbose_name=ugettext_lazy('Accepted Organizations Announced Deadline'))
 
   application_review_deadline = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Application Review Deadline'))
@@ -47,7 +49,7 @@
       verbose_name=ugettext_lazy('Community Bonding Period Start date'))
 
   bonding_end = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Community Bonding Period Start date'))
+      verbose_name=ugettext_lazy('Community Bonding Period End date'))
 
   coding_start = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Coding Start date'))
@@ -56,7 +58,7 @@
       verbose_name=ugettext_lazy('Coding End date'))
 
   suggested_coding_deadline = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Suggested Coding End date'))
+      verbose_name=ugettext_lazy('Suggested Coding Deadline'))
 
   midterm_survey_start = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Midterm Survey Start date'))
@@ -71,7 +73,7 @@
       verbose_name=ugettext_lazy('Final Survey End date'))
 
   mentor_summit_start = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Mentor Summit End date'))
+      verbose_name=ugettext_lazy('Mentor Summit Start date'))
 
   mentor_summit_end = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Mentor Summit End date'))