Changed a few single-character variable names