bettern class names
some fix in the hadoop interface (to test again)