More EAD refactoring/renaming