rename contexts for consistency
simplify a refactoring