Fix: renaming of variables not ended and empty dict not created