More fixes to align notation with our new convention