cleaned up naming and namespaces