Renaming of some of the domain classes to make it clearer