Fix some namespaces

Change-Id: I2e878a2d3894d9bd3e37a3c37c57b7531603bc3a
Fix missing string

Change-Id: Ic3413920fc78a07092a320ad76412d891a4ea0c8
Fix namespace

Change-Id: Ie14f59f3cc1dc161f81cc7dbd5815c4ac5770546