Updated scala and libraries, filename changes