Fix makefile to use the new package names and Text is no longer correct.