More Dto refactoring and renaming