refactor of context names