other updates related to new namespace r2