more naming edits