Renamed DAO files to prevent naming conflicts.