fix naming & update gradle