Namespace change fix-up