updated to new namespace format