NXP-12212 Make Service lookup by Name in addition of by Class