Fix naming bug