8086733: Improve namespace handling

Reviewed-by: dfuchs, lancea, ahgross
18 files changed