A few changes to naming of context methods