make db keys more consistent