Hominid: the group consisting of all modern and extinct Great Apes (that is, modern humans, chimpanzees, gorillas and orangutans plus all their immediate ancestors).
Hominin: the group consisting of modern humans, extinct human species and all our immediate ancestors (including members of the genera Homo, Australopithecus, Paranthropus and Ardipithecus).