Some variables renaming for consitency