- change licenseeName attribute according to the API
- StringUtils usage optimized