Bit more towards XSSF name support for #56737, will need some deeper changes though to fully implement