Improve target naming.