rebase: align variable names