fix namespaces for distuitls reorg