Issue #19288 Fix some hostname paths to be generic.