- fix the naming bug