change naming and add to faq