naming bug fixed