Renaming internal variables