Improve a constant name and related comments.

Change-Id: I607a084a31a9e941d17938eec10239776b19882a