Started fixing naming bug