Fixing variable names in Tasks Class