Refactor of Dtos names.