Repair tests by little renaming