Replace old terms with new, simplified terms