Considering going back to original set of names
Revert "Moved to new names but requiring statement of clean make it annoying"

This reverts commit fe7ff5e3d756836ec3f253e94156c9e04439e6e4.

Conflicts:
	Makefile