Also, make a few namespace corrections and some minor refactoring. Change-Id: Iedcaf6b43cb7576bc11dfefe980abd190c838831 [ROCm/rdc commit: 47fdfa4c7e]
47fdfa4c7e