Adapt service identifiers to new spark/action-pack package