update for new better name checking