Add alias to references when appropriate