Replace some misleading terms.