Improved task naming