use more consistent names for databases