Some changes in names and description