Merge "compass: Align scenario short names"