FORGE-1121: Support shortName in options