Name change

Cleans up comments