Changed terms to URN types