Clean work, mostly focused on namespace usage

Fixes many static analysis issues caused by foreward compat namespace changes
that where then already used.

Change-Id: I6b6044af0d6be1696e77a84474e31c45bf6bad30