Tweaked ShortName.  Lots of tests now pass (with run-test.perl -r and appropriate filters)