Renaming DAO class to reflect that they are actually DAO classes