Mini refactoring (mostly rename).