Change Names again

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	core/Makefile