Renaming stuff, fixing comments