solved naming confusion