removed Bid suffix from heuristic names.