Adjust northbound service naming

Ghost Userrequested to merge
istaester/adjust-nbi-service-naming into develop

Apply feedback about service naming from !349 (merged)

Edited by Ghost User

Merge request reports