am ac78633b: Rename and consolidate some constants

* commit 'ac78633be28e8990fc3b3a8de192c80966e746e3':
  Rename and consolidate some constants