Make namespace usage more consistent

Change-Id: I3d72571ec2464acbe11bc9affc1b03957b43d638
Merge "Make namespace usage more consistent"