Remove extraneous fields from entity names in the importer