Simpliy namespace refs

Change-Id: I8d99ad8f06100ba5861feb1dcebe081207aded4b