Fix invalid short name generation