minor changes to ids in scenarios