Bug fix for coding standards and namespaces