update namespace and fix ^M issue