Renamed EntityGenerator on the C++ side to CEntityGenerator