Use java classes instead of names #584