Some changes to stamps when sent, also some naming changes