adding task url and cleaning up naming