Switch to Entity objects instead of the raw name