Fix for unsupported names, fix for name change in update