Update long name/short name handling.
Update long name/short name handling.

Correctly detect long name cases and generate correct short names -
including handling short name collisions.

froggey/Mezzano,froggey/Mezzano