Remove Dto suffix / fixing mapping configuration fix #21