Let's use define constants here rather than string values....

Easier to keep track of their call sites.

Change-Id: I5f874194425ae8f5043bef45cce63a5e1d51a400