Refactoring and renaming of context IDs.