Fixed up "top-level" namespace so it's unique.