service_name -> service, package_name -> package; introduced private class check