modified to use the name definitions in the new DB schema