adjust to new db class names