CAUSEWAY-3676: renames some classes is all
9 files changed