Renaming ContextExtractor