Fix context naming issue.