rebase: clearer names for directory variables