Switch to a new terminology