Fix up the namespaces to match the draft Fundamentals TS.