[minor] renames, etc