Fix up namespace for master.