consolidate use of reflection; make terminology consistent.