Some forgotten variables are now renamed