solved naming issue