Conflicts with names have now been corrected