+1, this is much better and removes the need for the ${SHORTNAME} variable.