New variable names make more sense