Rename for readability

Altered a few variable names to be more self-explanatory in the
template.