Changed some identifiers for better semantics.
No functional changes.