Variables names, fixed renaming :bug: bug