Updates to the task to update the attribute names and make them a bit
more condensed (without being too terse - were too long before).