CSPACE-5678-D: Adding qualification to generated service bindings names so the Service layer can deal.