#497 add names to DB as well