naming bug fix