Refactored content to change names in preparation with other kinds of state dependencies.