Add some cosmetic changes to the pass: updates includes and constructor names.