Updated Namespaces to resolve conflicts