renamed variables for uniformity