Who should be called Homo?

It was thought Homo habilis, the ancient tool-using "handy man", gave rise to Homo erectus, which gave us Neanderthals in Europe and Homo sapiens in Africa. But that lineage has been called into question, and recent fossil discoveries have shown that our current way of naming ancient humans may no longer be fit for use. So which of our ancestors should be included in the genus Homo?