Minor corrections to make terminology consistent