Merge "Replace _host suffix with more standard -host suffix."