make terminology consistent