more variable renames to make them more expressive