Convert to new alias syntax
Merge pull request #1926 from 9rnsr/new_alias_syntax

Convert to new alias syntax