A few renaming, plus the hopefully final fastsim customizations