gradlew 1.8 -> 1.9
fix minor instrumentation bug
Fixe service resource names after refactoring.