fix Issue 3404 - JSON output should retain original alias names
Merge pull request #1515 from WalterBright/b18

fix Issue 3404 - JSON output should retain original alias names