Followd Arastreju's refactoring and renaming of context IDs.