refactored some class names and namespaces