fix on namespaces and dependencies