Bring aliases inline with standard