Modify according Scala namming conventions