java impl. and naming fixes