Mostly renaming
Corrected graphing errors