Renamed apps to relevant task names
Cleanup