Change variable names for clarity