Rework context terminology
1 file changed