cleanup some base DAOs (rename, remove @Repository, ...)