Updated the description and names