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