Clean up task vs task controller confusion in var names