Simplify variable names