DAO: another change on class naming in DAO