More consistent naming and description.