More fixes after name changes