Rename variable names

Rename variable names for consistency when reading.