fix enum names and id names