Gradle wrapper update
Field renaming
#48 - Removed Bus from service