Renaming DTOs and arguments.

4 jobs for !170 with 157-hotfix-notif-counter in 29 seconds (queued for 1 second)
latest merge request