switch to new db terms