Merge "ref: Change underscore to hyphen for principal tool."