some db name fixes