Cleanup and naming in preparation to scenario loop. No changes in results