Renames DbClient to CommonDbClient to avoid confusion