rename hidden variables, not visible ones
collapse more duplicates