Refine detection of bad names, improve false positives removal