Fixing some bugs related to the name change