diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index 34bbcd9..ca44a02 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -217,8 +217,8 @@
 		/* references to the per-NSVC components */
 		var NsvcTable g_nsvcs := {};
 		/* list of indexes to g_nsvcs[] of currently unblocked NSVCs */
-		var ro_integer g_unblocked_nsvcs_sig := {};
-		var ro_integer g_unblocked_nsvcs_data := {};
+		var Osmocom_Types.ro_integer g_unblocked_nsvcs_sig := {};
+		var Osmocom_Types.ro_integer g_unblocked_nsvcs_data := {};
 	};
 	type record NsvcTableEntry {
 		NSVCConfiguration cfg,
@@ -226,7 +226,6 @@
 		NsvcState state
 	};
 	type record of NsvcTableEntry NsvcTable;
-	type record of integer ro_integer;
 
 	/* internal port from the NS-VC point of view */
 	type port NSint_SP_PT message {
@@ -319,7 +318,7 @@
 			}
 		} else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) {
 			/* remove index to list of unblocked NSVCs */
-			var ro_integer new_unblocked_nsvcs_sig := {};
+			var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {};
 			for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) {
 				if (g_unblocked_nsvcs_sig[j] != i) {
 					new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j};
@@ -327,7 +326,7 @@
 			}
 			g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig;
 
-			var ro_integer new_unblocked_nsvcs_data := {};
+			var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {};
 			for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) {
 				if (g_unblocked_nsvcs_data[j] != i) {
 					new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j};