diff --git a/VERSION b/VERSION
index bea8e060..76afeb41 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.3.2 (2012-12-19 11:20:17) dev
+Version 2.3.2 (2012-12-19 11:23:59) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 0f795d19..c9472da4 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -279,7 +279,7 @@ class MetaScheduler(threading.Thread):
                 if tout:
                     try:
                         logger.debug(' partial output saved')
-                        db(sr.id == task.run_id).update(output=task_output)
+                        db(sr.id == task.run_id).update(run_output=task_output)
                         db.commit()
                     except:
                         pass
@@ -506,8 +506,8 @@ class Scheduler(MetaScheduler):
             Field('status', requires=IS_IN_SET(RUN_STATUS)),
             Field('start_time', 'datetime'),
             Field('stop_time', 'datetime'),
-            Field('output', 'text'),
-            Field('result', 'text'),
+            Field('run_output', 'text'),
+            Field('run_result', 'text'),
             Field('traceback', 'text'),
             Field('worker_name', default=self.worker_name),
             migrate=migrate)
@@ -650,8 +650,8 @@ class Scheduler(MetaScheduler):
                         db(db.scheduler_run.id == task.run_id).update(
                             status=task_report.status,
                             stop_time=now,
-                            result=task_report.result,
-                            output=task_report.output,
+                            run_result=task_report.result,
+                            run_output=task_report.output,
                             traceback=task_report.tb)
                     else:
                         logger.debug(' deleting task report in db because of no result')
@@ -956,8 +956,8 @@ class Scheduler(MetaScheduler):
                    limitby=(0, 1))
              ).first()
         if output:
-            row.result = row.scheduler_run.result and \
-                loads(row.scheduler_run.result,
+            row.result = row.scheduler_run.run_result and \
+                loads(row.scheduler_run.run_result,
                       object_hook=_decode_dict) or None
         return row