Convert to new alias syntax