more variable renames