Update namespacing to "shift"