[#3028] More dry outs and name changes.