small fixes
renamed files with java convention