renamed some namespaces, packages