Static reference names adjusted in AID