Merge pull request #1735 from benNew89/fix/orb-create-short-name