Better sample name. Account for machine sulks.

i.e. shorter, and also with more regex. Next I guess I workout how to turn it into a one-liner...