Another update for the terminology changes