Fix issue #27 and #28. Rename DAO methods.