Standardize on underscore name, add a description.