updated file to use better database naming scheme.