updated to new module namespace convention