Fixed naming bug