Service NBI - change some pydantic model names

6 jobs for !6133 with issue-1713-nbi-refactor in 25 minutes and 4 seconds (queued for 4 seconds)
latest merge request