update to new namespace changes