modify vars for better name convention