Switch properly close entities inventories to use entity types