rename identifiers to be more what they are