changed variable names

makes variable names good for [r] style names