small changes on variable names