Renaming DAO interfaces and impls to reflect the new spec wording