Fix Renaming Variables in aggregates and choice rules