Task naming versions

- Add task versions (useful for later when it matters).
- Update task + state naming to use various naming conventions.