another sweep of renaming/refactoring towards v3