Update namespaces

Signed-off-by: jruesga <jorge@ruesga.com>