For consistency, use dashes instead of underscores. Change-Id: I2da19b56952a8a9d172793ae211bdc58ddff4146