Rename some variables
Rename some variables to be consistent. Some were defined in plural others in singular.
This PR does not include any changes in behaviour.
Rename some variables to be consistent. Some were defined in plural others in singular.
This PR does not include any changes in behaviour.