Clean up

Changed some Names