Renamed a few things according to the names in HoTTBook.v