Solved naming bug