Renames multiple domain classes for consistency