changing terminology to a generic "entry" for everything, step and otherwise where possible