Improve checkoutDao, re-naming