Rename identifiers to reflect generality