Fix defining Azure aliases
Merge pull request #2584 from ogail/restructure

Fix defining Azure aliases