Also, make a few namespace corrections and some minor refactoring. Change-Id: Iedcaf6b43cb7576bc11dfefe980abd190c838831
Change-Id: I67567264c37e31f3409062a14e56eba4801cd944