Rename variable to a more intuitive name (see #317)