updates start of re-org of name-spacing