reverted namespace package to old conventions