Rename ambiguous variable names to fit their purpose