Namespace adjustment and context class