fix on variable naming