minor naming edits