Rename scripts and targets for clarity.
Add target info to makefile