Remove name param from DTO
Resolve conflicts