fix short variable names