Refactoring some of the names. Appended gradlew for consistency.