Add existing name checks following Website issues