Refactoring DAO classes variable names in model package