changed some conflicting namespaces and classes