Namespace correction