Some changes in names and comments