Small makefile update

Changed some names, fixed a test.