Fix shadowing issues with aggregation in Ronja

Signed-off-by: Stefan Plantikow <stefan.plantikow@neotechnology.com>