Cherry pick: Improved naming conventions for row and task