Changed the event/entity IDs to the format required by TEES