Maven => Gradle

+ minor renaming