Fixing namespace declarations.