Improve the short-name detection for stat'ing a PBI