rename some internal variables/functions