Cleanup: Use qualified names in macro for ease of use outside main library.
Cleanup: Use qualified names in macro for ease of use outside main library.

chandler14362/Bamboo,chandler14362/Bamboo,chandler14362/Bamboo