Rename variable to be more comprehensible and follow naming convention