refix: rename some global variables