Merge "Rename Stack to Task related terms (2/n)"