Fix up things missed in the first namespace PR