Renamed / refactored BE / Domain
More renaming