modify name of some variables for better readability