Fix naming in Amazon