Another re-namespace fix + test