Stop using dataset name
Adapt importer to let the ids be generated within the entities