EntityRef::NULL_ID changed to EntityRef::NullID