Restored confusing name of dao pacakage to the old one.