Change other things related to scala -> java of legacy files