minor naming edits

helping to make naming uniform