small variable renames