Removed de-standardization of RawWithName entities