Fast sim upgrade geometry configurations

* Make sure FastSim uses the same geometry labels as defined in standard sequences
* Revert changes to current FastSim geometry definition to keep unchanged current workflow