Refactor Exxx classes to EFxxx