minor naming edits

formatting edits to make things uniform