More updates to short_name function.