Clarify variable names for less confusion