More Clean up after better understanding.
Project name change.