Renamed things in EEService