clean up spelling, and use use_database when building dup class