Change service creation for new names

[#72169030]