rename variable, break long lines