ContextScope is now ContextSingleton, also in comments! :)