[CHG] Shorter variable names