Updated some namespaces.

Signed-off-by: Raul Ruiz <publiux@gmail.com>