Fixes database names for multi-servers

Database names were commited without checking with multiple servers. Previously, all databases with the same index but different servers were the same name. This fixes that and ensures that database names are per-server