CLSN-2010: fixed service names