Some variables renaming