Fix factor names for both ant and maven