Conform to naming conventions a bit better
also rename in HoTTBookExercises
Merge pull request #591 from mikeshulman/biinv-naming

Conform to naming conventions a bit better