fixing namespace usage


Change-Id: I36d4d1450116fee255ed59fe9ce2b47f024dc4b1