name changes and makefile fixes