Modified makefile to use old naming system.