Fix for name change