Machines should be singular.

Change-Id: I2ec3bdb37bbfd08d868d205989ca8fe0aaeda91e