Remove redundant Name class.
Work on Database interface.