Update and rename db.h to db_catalog.h