Agent names fix