Minor changes in names