ECMS-4304 [SANITIZATION] cleanup namespace and added 2 new namespace