Change db names from singular to plural