am c03330c2: am ac78633b: Rename and consolidate some constants

* commit 'c03330c202ec0af8126e15bbe2664f88f9696e1f':
  Rename and consolidate some constants