stashing changes
adding renames for guarantees