prefix imported types with module name

Fully qualify type names by prefixing with the module name
that they're imported from.

102232-1/LI-PS-PDU.asn

@@ -245,11 +245,11 @@ Payload ::= CHOICE
 		-- Clause 6.2.3 explains how to include more than one payload in the same PDU
 	tRIPayload				[2] TRIPayload,
 	...,
-	hI1-Operation			[3] HI1-Operation,
+	hI1-Operation			[3] HI1NotificationOperations.HI1-Operation,
 	encryptionContainer		[4] EncryptionContainer,
-	threeGPP-HI1-Operation	[5] ThreeGPP-HI1-Operation,
+	threeGPP-HI1-Operation	[5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation,
 		-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]
-	iLHIPayload				[6] SEQUENCE OF ILHIPayload,
+	iLHIPayload				[6] SEQUENCE OF ILHIPDU.ILHIPayload,
 		-- For typical use cases see ETSI TS 103 462 [45]
 	hI4Payload				[7] SEQUENCE OF HI4Payload
 }
@@ -282,7 +282,7 @@ CommunicationIdentifier ::= SEQUENCE
 	deliveryCountryCode				[2] PrintableString (SIZE (2)) OPTIONAL,
 		-- see clause 5.2.4
 	...,
-	cINExtension					[3] CorrelationValues OPTIONAL
+	cINExtension					[3] UmtsHI2Operations.CorrelationValues OPTIONAL
 		-- To be used when a single INTEGER is not sufficient to identify
 		-- a particular session (see clause 5.2.4)
 }
@@ -292,7 +292,7 @@ NetworkIdentifier ::= SEQUENCE
 	operatorIdentifier			[0] OCTET STRING (SIZE(1..16)),
 	networkElementIdentifier	[1] OCTET STRING (SIZE(1..16)) OPTIONAL,
 	...,
-	eTSI671NEID					[2] Network-Element-Identifier OPTIONAL
+	eTSI671NEID					[2] HI2Operations.Network-Element-Identifier OPTIONAL
 		-- For network element identifier, use either networkElementIdentifier or eTSI671NEID
 }
 
@@ -330,25 +330,25 @@ CCContents ::= CHOICE
 	-- Any of these choices may be commented out if they are not being used, see clause A.3
 {
 	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
-	emailCC						[1] EmailCC,
-	iPCC						[2] IPCC,
+	emailCC						[1] EmailPDU.EmailCC,
+	iPCC						[2] IPAccessPDU.IPCC,
 	-- tag [3] not used
 	uMTSCC						[4] OCTET STRING,
 	...,
 	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
-	l2CC						[6] L2CC,
+	l2CC						[6] L2AccessPDU.L2CC,
 	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,
 	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
 	tTRAFFIC-2					[9] TS101909202.TTRAFFIC,
 	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,
-	pstnIsdnCC					[11] PstnIsdnCC,
-	iPMMCC						[12] IPMMCC,
+	pstnIsdnCC					[11] PstnIsdnPDU.PstnIsdnCC,
+	iPMMCC						[12] IPMultimediaPDU.IPMMCC,
 	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
-	messagingCC					[14] MessagingCC,
+	messagingCC					[14] EmailPDU.MessagingCC,
 	ePSCC						[15] OCTET STRING,
 	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
     ePSCC-CC-PDU				[17] Eps-HI3-PS.CC-PDU,
-	messagingMMCC				[18] MessagingMMCC,
+	messagingMMCC				[18] EmailPDU.MessagingMMCC,
 	confCC-CC-PDU				[19] CONF-HI3-IMS.Conf-CC-PDU,
 	voipCC-CC-PDU				[20] VoIP-HI3-IMS.Voip-CC-PDU,
 	gcseCC-CC-PDU				[21] GCSE-HI3.Gcse-CC-PDU,
@@ -401,21 +401,21 @@ IRIContents ::= CHOICE
 	-- Any of these choices may be commented out if they are not being used (see clause A.3)
 {
 	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
-	emailIRI					[1] EmailIRI,
-	iPIRI						[2] IPIRI,
-	iPIRIOnly					[3] IPIRIOnly,
+	emailIRI					[1] EmailPDU.EmailIRI,
+	iPIRI						[2] IPAccessPDU.IPIRI,
+	iPIRIOnly					[3] IPAccessPDU.IPIRIOnly,
 	uMTSIRI						[4] UMTSIRI,
 	eTSI671IRI					[5] ETSI671IRI,
 	...,
-	l2IRI						[6] L2IRI,
-	l2IRIOnly					[7] L2IRIOnly,
+	l2IRI						[6] L2AccessPDU.L2IRI,
+	l2IRIOnly					[7] L2AccessPDU.L2IRIOnly,
 	tARGETACTIVITYMONITOR-1		[8] TS101909201.TARGETACTIVITYMONITOR-1,
 	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,
-	pstnIsdnIRI					[10] PstnIsdnIRI,
-	iPMMIRI						[11] IPMMIRI,
+	pstnIsdnIRI					[10] PstnIsdnPDU.PstnIsdnIRI,
+	iPMMIRI						[11] IPMultimediaPDU.IPMMIRI,
 	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
 	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
-	messagingIRI				[14] MessagingIRI,
+	messagingIRI				[14] EmailPDU.MessagingIRI,
 	ePSIRI						[15] EPSIRI,
 	confIRI						[16] ConfIRI,
 	proseIRI					[17] ProSeIRI,
@@ -427,17 +427,17 @@ UMTSIRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-Parameters		[0] UmtsHI2Operations.IRI-Parameters,
-	umtsIRIsContent		[1] UmtsIRIsContent,
+	umtsIRIsContent		[1] UmtsHI2Operations.UmtsIRIsContent,
 	...,
 	iRI-CS-Parameters	[2] UmtsCS-HI2Operations.IRI-Parameters,
-	umtsCS-IRIsContent	[3] UmtsCS-IRIsContent
+	umtsCS-IRIsContent	[3] UmtsCS-HI2Operations.UmtsCS-IRIsContent
 }
 
 ETSI671IRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-Parameters	[0] HI2Operations.IRI-Parameters,
-	iRIsContent		[1] IRIsContent,
+	iRIsContent		[1] HI2Operations.IRIsContent,
 	...
 }
 
@@ -445,7 +445,7 @@ EPSIRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-EPS-Parameters	[0] EpsHI2Operations.IRI-Parameters,
-	epsIRIsContent		[1] EpsIRIsContent,
+	epsIRIsContent		[1] EpsHI2Operations.EpsIRIsContent,
 	...
 }
 
@@ -453,7 +453,7 @@ ConfIRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-Conf-Parameters		[0] CONFHI2Operations.IRI-Parameters,
-	confIRIsContent			[1] ConfIRIsContent,
+	confIRIsContent			[1] CONFHI2Operations.ConfIRIsContent,
 	...
 }
 
@@ -462,7 +462,7 @@ ProSeIRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-ProSe-Parameters	[0] ProSeHI2Operations.IRI-Parameters,
-	proseIRIsContent		[1] ProSeIRIsContent,
+	proseIRIsContent		[1] ProSeHI2Operations.ProSeIRIsContent,
 	...
 }
 
@@ -471,7 +471,7 @@ GcseIRI ::= CHOICE
 	-- This structure may be commented out if not used
 {
 	iRI-Gcse-Parameters		[0] GCSEHI2Operations.IRI-Parameters,
-	gcseIRIsContent			[1] GcseIRIsContent,
+	gcseIRIsContent			[1] GCSEHI2Operations.GcseIRIsContent,
 	...
 }
 
@@ -726,10 +726,10 @@ IP-value ::= CHOICE
 	...
 }
 
-LawfulInterceptionIdentifier ::= LIID
+LawfulInterceptionIdentifier ::= Common-Parameters.LIID
 	-- LIID is a common parameter imported from ETSI TS 103 280 [44].
 	-- It is redefined as LawfulInterceptionIdentifier in this
 	-- module to preserve the original type name during the
 	-- removal of imports from ETSI TS 101 671 [4].
 
-END --end of LI-PS-PDU
+END --end of LI-PS-PDU
\ No newline at end of file

102232-2/EmailPDU.asn

@@ -69,9 +69,9 @@ EmailIRI ::= SEQUENCE
 {
 	emailIRIObjId				[0] RELATIVE-OID,
 	eventType					[1] E-mail-Event,
-	client-Address				[2] IPAddress OPTIONAL,
+	client-Address				[2] LI-PS-PDU.IPAddress OPTIONAL,
 		-- Provided if available
-	server-Address				[3] IPAddress OPTIONAL,
+	server-Address				[3] LI-PS-PDU.IPAddress OPTIONAL,
 		-- Provided if available
 	client-Port					[4] INTEGER OPTIONAL,
 		-- Provided if available
@@ -240,7 +240,7 @@ MessagingMMCC ::= SEQUENCE
 	event-identifier			[1] INTEGER (0..4294967295),
 		-- Used to correlate to MessagingIRI within the same CIN
 	content-identifier			[2] INTEGER (0..4294967295) OPTIONAL,
-	content						[3] IPMMCC,
+	content						[3] IPMultimediaPDU.IPMMCC,
 	...
 }
 
@@ -398,7 +398,7 @@ Messaging-Party-Identity ::= CHOICE
 	email-address			[2] E-mail-Address-List,
 		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
 	...,
-	ip-address				[3] IPAddress,
+	ip-address				[3] LI-PS-PDU.IPAddress,
 		-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
 	alphanumeric			[4] UTF8String,
 	ip-address-and-port	[5] IP-Address-And-Port,
@@ -427,7 +427,7 @@ Messaging-Party-Identity ::= CHOICE
 
 IP-Address-And-Port ::= SEQUENCE
 {
-	ip-address				[0] IPAddress,
+	ip-address				[0] LI-PS-PDU.IPAddress,
 		-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
 	port-number				[1] INTEGER,
 		-- port-number is defined by IETF RFC 6335 [35]
@@ -541,4 +541,4 @@ Messaging-Property-Requested-Reports ::= ENUMERATED
 	...
 }
 
-END -- end of EmailPDU
+END -- end of EmailPDU
\ No newline at end of file

102232-3/IPAccessPDU.asn

@@ -58,7 +58,7 @@ IPIRIContents ::= SEQUENCE
 		-- in ASCII-characters
 	internetAccessType		[2] InternetAccessType,
 	iPVersion				[3] IPVersion,
-	targetIPAddress			[4] IPAddress OPTIONAL,
+	targetIPAddress			[4] LI-PS-PDU.IPAddress OPTIONAL,
 		-- IP address may not be available in case of failed logon attempts.
 		-- If it is available, it must be sent.
 		-- This field will carry the first IPv4 or IPv6 target IP address with or without 
@@ -94,11 +94,11 @@ IPIRIContents ::= SEQUENCE
 		-- The phone number dialed by the target for dial-up
 	pOPIdentifier			[18] IPIRIIDType OPTIONAL,
 		-- The identifier or name of the POP
-	pOPIPAddress			[19] IPAddress OPTIONAL,
+	pOPIPAddress			[19] LI-PS-PDU.IPAddress OPTIONAL,
 		-- The IP address of the POP
 	nationalIPIRIParameters	[20] NationalIPIRIParameters OPTIONAL,
 		-- National IP IRI Parameters
-	additionalIPAddress		[21] IPAddress OPTIONAL,
+	additionalIPAddress		[21] LI-PS-PDU.IPAddress OPTIONAL,
 		-- This field will carry the first IPv6 target IP address with or without prefix when the 
 		-- iPVersion parameter is set to iPV4andV6.
 		-- Use of this field is fully described in section 6.2.1
@@ -108,7 +108,7 @@ IPIRIContents ::= SEQUENCE
 		-- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses
 		-- It is used when multiple subnet/prefix ranges are assigned to a target service.
 		-- Use of this field is fully described in section 6.2.1
-	location				[24] Location OPTIONAL,
+	location				[24] LI-PS-PDU.Location OPTIONAL,
 		-- The location associated with the target
 	pOPPortID				[25] OCTET STRING OPTIONAL,
 		-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
@@ -202,7 +202,7 @@ IPIRIIDType ::= CHOICE
 		-- For printable userIDs, such as the Radius username, phonenumbers
 	macAddressType			[1] OCTET STRING (SIZE (6)),
 		-- For MAC address types, raw binary format as in RFC 2132 [15]
-	ipAddressType			[2] IPAddress,
+	ipAddressType			[2] LI-PS-PDU.IPAddress,
 		-- For IP address types
 	...
 }
@@ -242,7 +242,7 @@ OtherTargetIdentifiers ::= CHOICE
 		-- Additional target identifiers associated with the target service
 		-- This list is extensible to accommodate other target identifiers which 
 		-- may be required in future.
-	iPAddress		[0] IPAddress,
+	iPAddress		[0] LI-PS-PDU.IPAddress,
 		-- IPAddress imported from TS 102 232 [2].
 		-- This can be an IPv4 address (with or without a subnet range defined) or 
 		-- an IPv6 address (with or without a prefix range defined).

102232-5/IPMultimediaPDU.asn

@@ -96,7 +96,7 @@ IPMMIRI ::= SEQUENCE
 	iPMMIRIObjId				[0] RELATIVE-OID,
 	iPMMIRIContents				[1] IPIRIContents,
 	...,
-	targetLocation				[2] Location OPTIONAL,
+	targetLocation				[2] LI-PS-PDU.Location OPTIONAL,
 		-- This common parameter is defined in ETSI TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3
 	additionalSignalling		[3] SEQUENCE OF AdditionalSignalling OPTIONAL
 		-- The use of this parameter is defined in clause 5.2.5
@@ -129,16 +129,16 @@ IPIRIContents ::= CHOICE
 
 SIPMessage ::= SEQUENCE
 {
-	iPSourceAddress				[0] IPAddress,
-	iPDestinationAddress		[1] IPAddress,
+	iPSourceAddress				[0] LI-PS-PDU.IPAddress,
+	iPDestinationAddress		[1] LI-PS-PDU.IPAddress,
 	sIPContent					[2] OCTET STRING,
 	...
 }
 
 H323Message ::= SEQUENCE
 {
-	iPSourceAddress				[0] IPAddress,
-	iPDestinationAddress		[1] IPAddress,
+	iPSourceAddress				[0] LI-PS-PDU.IPAddress,
+	iPDestinationAddress		[1] LI-PS-PDU.IPAddress,
 	h323Content					[2] H323MessageContent,
 	...
 }

102232-6/PstnIsdnPDU.asn

@@ -74,7 +74,7 @@ SupplementaryInfo ::= SEQUENCE
 InformationAppliesTo ::= SEQUENCE
 	-- Identifies the PDUs to which a piece of supplementary information applies
 {
-	payloadDirection		[0] PayloadDirection,
+	payloadDirection		[0] LI-PS-PDU.PayloadDirection,
 		-- The direction of the traffic to which this info applies
 	cCLinkID				[1] INTEGER (0..65535) OPTIONAL,
 		-- If there are multiple CCLinks, this field states CCLink to which this info applies