func and variable renames