Expand DB to DrawingBuffer as requested. Have not expanded WDT because
many of the names become too long.
Merge branch 'unstripped'