Rename variables for optimal readability

The variable names in the spec are a bit cryptic.