resolved variable naming issue