Better descriptions

Name changes