fixed db naming issues