fix db naming scheme