Fixed the class namespace issues