Merge "resolv: second pass of underscore removal"