More fixes after changing the name