Minor changes to names and description.