Edit db names to make more sense