Fix db problem, but commit mistake on name changes