Update to match namespace update