rename db vars
Revert "rename db vars"

This reverts commit 9f57651a7b2fac096d39289ead790c0844c1936d.