More namespace fixes

2 jobs for master in 4 minutes and 34 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #29416
linux
build_with_linux

00:02:09

passed #29417
windows
build_with_windows

00:04:34