Removed 'Task' from variable names