Some renaming of variables