Fix inconsistent terminology.  pmurias++