fixed names and namespaces