fix some naming / namespaces