fixed database naming