Namespace fix

Change-Id: Ic9289d2b0341d2da3f3ab919df86b721150cd4da