Remove bugs in namespaces

Change-Id: Ie545b1fa1585b94db8bd242c7cb74d125f62fd1e