#3 Rename Task to Goal and TaskDefinition to Task