Makefile changes for recent cryto name cleanups