Fixed the naming bug