New service broker version with simpler naming

[#72169030]