Converted all type references to urns