And fix up namespace formatting which was a pain.