Update Matrix java method names and Adjust makefile