More name and package refactoring for clarity.