Correct DTO interfaces and DTO implementation classes.