change variable name accroding to comments