Updates names in importer and tests