ENH better variable names