Renames multiple domain classes for consistency

Backports this change from 1.8