CN - updated Makefile after some files have been renamed.