Shorten some variable names to fit some lines into 80-char