rename dao classes to have the same structure