No one should be allowed to call himself a hindu without a stringent written test on hinduism. the test should be several days long. It would include questions from all Hindu holy books. The candidate must show mastery over a certain set of rituals and must accept good, bad and the ugly about Hinduism.
People who do not succeed in one attempt must either pick another religion or give up any organized religion or start a new one.