Unify namespaces

Change namespace from copied sample code