#472 Rename short variables to more descriptive names
#472 Corrected plural